From 52388da14ae3c8c0e536faba2322e1862e6e97fb Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Fri, 4 Apr 2014 10:16:50 +0000 Subject: [PATCH] kernel: fix kmod-sound-core for 3.14 pcm-page-alloc was merged into snd-pcm. Signed-off-by: Jonas Gorski SVN-Revision: 40377 --- package/kernel/linux/modules/sound.mk | 10 ++++++++-- 1 file 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