aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-04-04 10:16:50 +0000
committerJonas Gorski <jogo@openwrt.org>2014-04-04 10:16:50 +0000
commit52388da14ae3c8c0e536faba2322e1862e6e97fb (patch)
treeb1583e01bea74605e9dd07081655f1701a99433b /package/kernel
parenta8363fadcd32c687ec5b0902e8dbde7317c4a0f9 (diff)
downloadupstream-52388da14ae3c8c0e536faba2322e1862e6e97fb.tar.gz
upstream-52388da14ae3c8c0e536faba2322e1862e6e97fb.tar.bz2
upstream-52388da14ae3c8c0e536faba2322e1862e6e97fb.zip
kernel: fix kmod-sound-core for 3.14
pcm-page-alloc was merged into snd-pcm. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 40377
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/linux/modules/sound.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk
index ebdd3d9fe3..be01638174 100644
--- a/package/kernel/linux/modules/sound.mk
+++ b/package/kernel/linux/modules/sound.mk
@@ -11,7 +11,6 @@ SOUND_MENU:=Sound Support
SOUNDCORE_LOAD ?= \
soundcore \
snd \
- snd-page-alloc \
snd-hwdep \
snd-seq-device \
snd-rawmidi \
@@ -23,7 +22,6 @@ SOUNDCORE_LOAD ?= \
SOUNDCORE_FILES ?= \
$(LINUX_DIR)/sound/soundcore.ko \
$(LINUX_DIR)/sound/core/snd.ko \
- $(LINUX_DIR)/sound/core/snd-page-alloc.ko \
$(LINUX_DIR)/sound/core/snd-hwdep.ko \
$(LINUX_DIR)/sound/core/seq/snd-seq-device.ko \
$(LINUX_DIR)/sound/core/snd-rawmidi.ko \
@@ -48,6 +46,14 @@ SOUNDCORE_FILES += \
$(if $(CONFIG_SND_DMAENGINE_PCM),$(LINUX_DIR)/sound/core/snd-pcm-dmaengine.ko)
endif
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,3.14.0)),1)
+SOUNDCORE_LOAD += \
+ snd-page-alloc
+
+SOUNDCORE_FILES += \
+ $(LINUX_DIR)/sound/core/snd-page-alloc.ko
+endif
+
define KernelPackage/sound-core
SUBMENU:=$(SOUND_MENU)
TITLE:=Sound support