ath9k: fix a crash in led init

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

diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index da56f25..2d0a987 100644 (file)
--- a/package/kernel/modules/sound.mk
+++ b/package/kernel/modules/sound.mk
@@ -22,34 +22,7 @@ endef
 $(eval $(call KernelPackage,pcspkr))
 
 
 $(eval $(call KernelPackage,pcspkr))
 
 

-define KernelPackage/sound-core
-  SUBMENU:=$(SOUND_MENU)
-  TITLE:=Sound support
-  DEPENDS:=@AUDIO_SUPPORT
-  KCONFIG:= \
-       CONFIG_SOUND \
-       CONFIG_SND \
-       CONFIG_SND_HWDEP \
-       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 \
-       CONFIG_SND_PCM_OSS \
-       CONFIG_SND_MIXER_OSS \
-       CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-  $(call AddDepends/input)
-endef
-
-define KernelPackage/sound-core/2.4
-  FILES:=$(LINUX_DIR)/drivers/sound/soundcore.ko
-  AUTOLOAD:=$(call AutoLoad,30,soundcore)
-endef
-
-# allow 2.6 targets to override the soundcore stuff
+# allow targets to override the soundcore stuff

 SOUNDCORE_LOAD ?= \
        soundcore \
        snd \
 SOUNDCORE_LOAD ?= \
        soundcore \
        snd \


@@ -74,9 +47,28 @@ SOUNDCORE_FILES ?= \
        $(LINUX_DIR)/sound/core/oss/snd-mixer-oss.ko \
        $(LINUX_DIR)/sound/core/oss/snd-pcm-oss.ko
 
        $(LINUX_DIR)/sound/core/oss/snd-mixer-oss.ko \
        $(LINUX_DIR)/sound/core/oss/snd-pcm-oss.ko
 

-define KernelPackage/sound-core/2.6
+define KernelPackage/sound-core
+  SUBMENU:=$(SOUND_MENU)
+  TITLE:=Sound support
+  DEPENDS:=@AUDIO_SUPPORT
+  KCONFIG:= \
+       CONFIG_SOUND \
+       CONFIG_SND \
+       CONFIG_SND_HWDEP \
+       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 \
+       CONFIG_SND_PCM_OSS \
+       CONFIG_SND_MIXER_OSS \
+       CONFIG_SOUND_OSS_CORE_PRECLAIM=y

   FILES:=$(SOUNDCORE_FILES)
   AUTOLOAD:=$(call AutoLoad,30,$(SOUNDCORE_LOAD))
   FILES:=$(SOUNDCORE_FILES)
   AUTOLOAD:=$(call AutoLoad,30,$(SOUNDCORE_LOAD))

+  $(call AddDepends/input)

 endef
 
 define KernelPackage/sound-core/uml
 endef
 
 define KernelPackage/sound-core/uml


@@ -99,13 +91,29 @@ define AddDepends/sound
 endef
 
 
 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
 define KernelPackage/sound-i8x0
   TITLE:=Intel/SiS/nVidia/AMD/ALi AC97 Controller

+  DEPENDS:=+kmod-ac97

   KCONFIG:=CONFIG_SND_INTEL8X0
   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
 
   $(call AddDepends/sound)
 endef
 


@@ -120,11 +128,10 @@ $(eval $(call KernelPackage,sound-i8x0))
 
 define KernelPackage/sound-cs5535audio
   TITLE:=CS5535 PCI Controller
 
 define KernelPackage/sound-cs5535audio
   TITLE:=CS5535 PCI Controller

+  DEPENDS:=+kmod-ac97

   KCONFIG:=CONFIG_SND_CS5535AUDIO
   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
 
   $(call AddDepends/sound)
 endef