summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-04-09 23:26:00 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-04-09 23:26:00 +0000
commit8982313f7e2b50f215e1d12eb2fd1bace78e3282 (patch)
tree867f2432e917cb8c7165a55a3d4bf11c88cc87f4
parent76cd9d7bc5adba2fea446f57d95406cd19a2b6f8 (diff)
sound: do not pack ac97_bus.ko and snd-ac97-codec.ko into two packages.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26568 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/modules/sound.mk31
1 files changed, 23 insertions, 8 deletions
diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index da56f25e8..b46f25128 100644
--- a/package/kernel/modules/sound.mk
+++ b/package/kernel/modules/sound.mk
@@ -99,13 +99,29 @@ define AddDepends/sound
endef
+define KernelPackage/ac97
+ TITLE:=ac97 controller
+ KCONFIG:=CONFIG_SND_AC97_CODEC
+ FILES:= \
+ $(LINUX_DIR)/sound/ac97_bus.ko \
+ $(LINUX_DIR)/sound/pci/ac97/snd-ac97-codec.ko
+ AUTOLOAD:=$(call AutoLoad,35,ac97_bus snd-ac97-codec)
+ $(call AddDepends/sound)
+endef
+
+define KernelPackage/ac97/description
+ The ac97 controller
+endef
+
+$(eval $(call KernelPackage,ac97))
+
+
define KernelPackage/sound-i8x0
TITLE:=Intel/SiS/nVidia/AMD/ALi AC97 Controller
+ DEPENDS:=+kmod-ac97
KCONFIG:=CONFIG_SND_INTEL8X0
- FILES:=$(LINUX_DIR)/sound/pci/snd-intel8x0.ko \
- $(LINUX_DIR)/sound/ac97_bus.ko \
- $(LINUX_DIR)/sound/pci/ac97/snd-ac97-codec.ko
- AUTOLOAD:=$(call AutoLoad,35,ac97_bus snd-ac97-codec snd-intel8x0)
+ FILES:=$(LINUX_DIR)/sound/pci/snd-intel8x0.ko
+ AUTOLOAD:=$(call AutoLoad,36,snd-intel8x0)
$(call AddDepends/sound)
endef
@@ -120,11 +136,10 @@ $(eval $(call KernelPackage,sound-i8x0))
define KernelPackage/sound-cs5535audio
TITLE:=CS5535 PCI Controller
+ DEPENDS:=+kmod-ac97
KCONFIG:=CONFIG_SND_CS5535AUDIO
- FILES:=$(LINUX_DIR)/sound/pci/cs5535audio/snd-cs5535audio.ko \
- $(LINUX_DIR)/sound/ac97_bus.ko \
- $(LINUX_DIR)/sound/pci/ac97/snd-ac97-codec.ko
- AUTOLOAD:=$(call AutoLoad,35, ac97_bus snd-ac97-codec snd-cs5535audio)
+ FILES:=$(LINUX_DIR)/sound/pci/cs5535audio/snd-cs5535audio.ko
+ AUTOLOAD:=$(call AutoLoad,36,snd-cs5535audio)
$(call AddDepends/sound)
endef