[etrax] Update and add patches

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

diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index 11d816b..1aa0bf3 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||PCI_SUPPORT @!TARGET_atheros
+  DEPENDS:=@PCI_SUPPORT||USB_SUPPORT
   KCONFIG:= \
        CONFIG_SOUND \
        CONFIG_SND \
@@ -32,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) \
@@ -44,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
@@ -88,3 +91,19 @@ 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))