aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMirko Vogt <mirko@openwrt.org>2009-01-12 22:47:00 +0000
committerMirko Vogt <mirko@openwrt.org>2009-01-12 22:47:00 +0000
commit40d4bb7d0acf7fdbfaac9853dea475ddce99cc04 (patch)
tree27c6d3d4eafed6d59ee636131c0fc8762b02221a
parentd40b0ac6f846f4d4a555da01d3f1e6c0a94dea20 (diff)
downloadupstream-40d4bb7d0acf7fdbfaac9853dea475ddce99cc04.tar.gz
upstream-40d4bb7d0acf7fdbfaac9853dea475ddce99cc04.tar.bz2
upstream-40d4bb7d0acf7fdbfaac9853dea475ddce99cc04.zip
allow targets to override kernel related soundcore configuration
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13999 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/modules/sound.mk32
1 files changed, 18 insertions, 14 deletions
diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index 547fddc830..1aa0bf317a 100644
--- a/package/kernel/modules/sound.mk
+++ b/package/kernel/modules/sound.mk
@@ -31,8 +31,20 @@ define KernelPackage/sound-core/2.4
AUTOLOAD:=$(call AutoLoad,30,soundcore)
endef
-define KernelPackage/sound-core/2.6
- FILES:= \
+# allow 2.6 targets to override the soundcore stuff
+SOUNDCORE_LOAD ?= \
+ soundcore \
+ snd \
+ snd-page-alloc \
+ snd-hwdep \
+ snd-seq-device \
+ snd-rawmidi \
+ snd-timer \
+ snd-pcm \
+ $(if $(CONFIG_SND_MIXER_OSS),snd-mixer-oss) \
+ $(if $(CONFIG_SND_PCM_OSS),snd-pcm-oss)
+
+SOUNDCORE_FILES ?= \
$(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/sound/core/snd.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/sound/core/snd-page-alloc.$(LINUX_KMOD_SUFFIX) \
@@ -43,18 +55,10 @@ define KernelPackage/sound-core/2.6
$(LINUX_DIR)/sound/core/snd-pcm.$(LINUX_KMOD_SUFFIX) \
$(if $(CONFIG_SND_MIXER_OSS),$(LINUX_DIR)/sound/core/oss/snd-mixer-oss.$(LINUX_KMOD_SUFFIX)) \
$(if $(CONFIG_SND_PCM_OSS),$(LINUX_DIR)/sound/core/oss/snd-pcm-oss.$(LINUX_KMOD_SUFFIX))
- AUTOLOAD:=$(call AutoLoad,30, \
- soundcore \
- snd \
- snd-page-alloc \
- snd-hwdep \
- snd-seq-device \
- snd-rawmidi \
- snd-timer \
- snd-pcm \
- $(if $(CONFIG_SND_MIXER_OSS),snd-mixer-oss) \
- $(if $(CONFIG_SND_PCM_OSS),snd-pcm-oss) \
- )
+
+define KernelPackage/sound-core/2.6
+ FILES:=$(SOUNDCORE_FILES)
+ AUTOLOAD:=$(call AutoLoad,30,$(SOUNDCORE_LOAD))
endef
define KernelPackage/sound-core/uml-2.6