Fix ATM usb device selection (#3429)

[openwrt.git] / package / kernel / modules / sound.mk

diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index 78dd334..547fddc 100644 (file)
--- a/package/kernel/modules/sound.mk
+++ b/package/kernel/modules/sound.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +8,10 @@
 
 SOUND_MENU:=Sound Support
 
-# XXX: remove @!TARGET_* later when we have PCI & USB support properly detected on all targets
 define KernelPackage/sound-core
   SUBMENU:=$(SOUND_MENU)
   TITLE:=Sound support
-  DEPENDS:=@USB_SUPPORT @!TARGET_atheros
+  DEPENDS:=@PCI_SUPPORT||USB_SUPPORT
   KCONFIG:= \
        CONFIG_SOUND \
        CONFIG_SND \
@@ -20,6 +19,10 @@ define KernelPackage/sound-core
        CONFIG_SND_RAWMIDI \
        CONFIG_SND_TIMER \
        CONFIG_SND_PCM \
+       CONFIG_SND_SEQUENCER \
+       CONFIG_SND_VIRMIDI \
+       CONFIG_SND_SEQ_DUMMY \
+       CONFIG_SND_SEQUENCER_OSS=y \
        CONFIG_HOSTAUDIO
 endef
 
@@ -29,17 +32,12 @@ define KernelPackage/sound-core/2.4
 endef
 
 define KernelPackage/sound-core/2.6
-#  KCONFIG+= \
-#      CONFIG_SND \
-#      CONFIG_SND_HWDEP \
-#      CONFIG_SND_RAWMIDI \
-#      CONFIG_SND_TIMER \
-#      CONFIG_SND_PCM
   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) \
        $(LINUX_DIR)/sound/core/snd-hwdep.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/sound/core/seq/snd-seq-device.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/sound/core/snd-rawmidi.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/sound/core/snd-timer.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/sound/core/snd-pcm.$(LINUX_KMOD_SUFFIX) \
@@ -50,6 +48,7 @@ define KernelPackage/sound-core/2.6
        snd \
        snd-page-alloc \
        snd-hwdep \
+       snd-seq-device \
        snd-rawmidi \
        snd-timer \
        snd-pcm \
@@ -59,8 +58,6 @@ define KernelPackage/sound-core/2.6
 endef
 
 define KernelPackage/sound-core/uml-2.6
-#  KCONFIG+= \
-#      CONFIG_HOSTAUDIO
   FILES:= \
        $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX)
@@ -73,3 +70,36 @@ endef
 
 $(eval $(call KernelPackage,sound-core))
 
+define KernelPackage/sound-i8x0
+  SUBMENU:=$(SOUND_MENU)
+  TITLE:=Intel/SiS/nVidia/AMD/ALi AC97 Controller
+  DEPENDS:=kmod-sound-core
+  KCONFIG:=CONFIG_SND_INTEL8X0
+  FILES:=$(LINUX_DIR)/sound/pci/snd-intel8x0.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,35,snd-i8x0)
+endef
+
+define KernelPackage/sound-i8x0/description
+ support for the integrated AC97 sound device on motherboards
+ with Intel/SiS/nVidia/AMD chipsets, or ALi chipsets using 
+ the M5455 Audio Controller.
+endef
+
+$(eval $(call KernelPackage,sound-i8x0))
+
+define KernelPackage/sound-cs5535audio
+  SUBMENU:=$(SOUND_MENU)
+  TITLE:=CS5535 PCI Controller
+  DEPENDS:=kmod-sound-core
+  KCONFIG:=CONFIG_SND_CS5535AUDIO
+  FILES:=$(LINUX_DIR)/sound/pci/cs5535audio/snd-cs5535audio.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/sound/ac97_bus.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/sound/pci/ac97/snd-ac97-codec.$(LINUX_KMOD_SUFFIX) 
+  AUTOLOAD:=$(call AutoLoad,35, ac97_bus snd-ac97-codec snd-cs5535audio)
+endef
+
+define KernelPackage/sound-cs5535audio/description
+ support for the integrated AC97 sound device on olpc
+endef
+
+$(eval $(call KernelPackage,sound-cs5535audio))