summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-04 10:16:41 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-04 10:16:41 +0200
commitde2ac99f6da6ae960bc8c3833c38353f40f536f4 (patch)
treebaf71d2fa99dc8d6ff3aac372e209110cf129f35 /target
parent91ca53c9a4e7812be2c1d9d775fd127237f5abd4 (diff)
parent075dcf5fa7482e33358d5603f39d68088741e3c4 (diff)
Merge branch 'master' of git+ssh://www.openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r--target/linux/config/Config.in.audio2
-rw-r--r--target/packages/pkg-available/mpdbox1
2 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index a1a5077e6..f87a7e751 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -124,7 +124,7 @@ config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
select ADK_KPACKAGE_KMOD_SND
select ADK_KERNEL_SND_ARM
select ADK_KPACKAGE_KMOD_SND_SOC
- select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE
+ select ADK_KPACKAGE_KMOD_SND_PCM_DMAENGINE if !ADK_KERNEL_VERSION_3_10_34
select ADK_KPACKAGE_KMOD_SND_COMPRESS
depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox
index eab49bc8a..b67197c11 100644
--- a/target/packages/pkg-available/mpdbox
+++ b/target/packages/pkg-available/mpdbox
@@ -49,6 +49,7 @@ config ADK_PKG_MPDBOX
select ADK_PACKAGE_PHP_FASTCGI
select ADK_PACKAGE_SCREEN
select ADK_PACKAGE_VIM
+ select ADK_PACKAGE_E2FSCK
select ADK_PACKAGE_ALSA_UTILS
select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER
select ADK_KPACKAGE_KMOD_SND_INTEL8X0 if ADK_TARGET_SYSTEM_QEMU_I686