package/mac80211: fix atomic64 issues on x86 / uml

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

diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index f925ebc..2d0a987 100644 (file)
--- a/package/kernel/modules/sound.mk
+++ b/package/kernel/modules/sound.mk
@@ -11,7 +11,7 @@ define KernelPackage/pcspkr
   SUBMENU:=$(SOUND_MENU)
   TITLE:=PC speaker support
   KCONFIG:=CONFIG_INPUT_PCSPKR
   SUBMENU:=$(SOUND_MENU)
   TITLE:=PC speaker support
   KCONFIG:=CONFIG_INPUT_PCSPKR

-  FILES:=$(LINUX_DIR)/drivers/input/misc/pcspkr.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/input/misc/pcspkr.ko

   AUTOLOAD:=$(call AutoLoad,50,pcspkr)
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,pcspkr)
 endef
 


@@ -22,6 +22,31 @@ endef
 $(eval $(call KernelPackage,pcspkr))
 
 
 $(eval $(call KernelPackage,pcspkr))
 
 

+# allow targets to override the soundcore stuff
+SOUNDCORE_LOAD ?= \
+       soundcore \
+       snd \
+       snd-page-alloc \
+       snd-hwdep \
+       snd-seq-device \
+       snd-rawmidi \
+       snd-timer \
+       snd-pcm \
+       snd-mixer-oss \
+       snd-pcm-oss
+
+SOUNDCORE_FILES ?= \
+       $(LINUX_DIR)/sound/soundcore.ko \
+       $(LINUX_DIR)/sound/core/snd.ko \
+       $(LINUX_DIR)/sound/core/snd-page-alloc.ko \
+       $(LINUX_DIR)/sound/core/snd-hwdep.ko \
+       $(LINUX_DIR)/sound/core/seq/snd-seq-device.ko \
+       $(LINUX_DIR)/sound/core/snd-rawmidi.ko \
+       $(LINUX_DIR)/sound/core/snd-timer.ko \
+       $(LINUX_DIR)/sound/core/snd-pcm.ko \
+       $(LINUX_DIR)/sound/core/oss/snd-mixer-oss.ko \
+       $(LINUX_DIR)/sound/core/oss/snd-pcm-oss.ko
+

 define KernelPackage/sound-core
   SUBMENU:=$(SOUND_MENU)
   TITLE:=Sound support
 define KernelPackage/sound-core
   SUBMENU:=$(SOUND_MENU)
   TITLE:=Sound support


@@ -41,48 +66,15 @@ define KernelPackage/sound-core
        CONFIG_SND_PCM_OSS \
        CONFIG_SND_MIXER_OSS \
        CONFIG_SOUND_OSS_CORE_PRECLAIM=y
        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.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,soundcore)
-endef
-
-# 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 \
-       snd-mixer-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) \
-       $(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) \
-       $(LINUX_DIR)/sound/core/oss/snd-mixer-oss.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/sound/core/oss/snd-pcm-oss.$(LINUX_KMOD_SUFFIX)
-
-define KernelPackage/sound-core/2.6

   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
   FILES:= \
 endef
 
 define KernelPackage/sound-core/uml
   FILES:= \

-       $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/sound/soundcore.ko \
+       $(LINUX_DIR)/arch/um/drivers/hostaudio.ko

   AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio)
 endef
 
   AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio)
 endef
 


@@ -99,11 +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.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,35,snd-i8x0)
+  FILES:=$(LINUX_DIR)/sound/pci/snd-intel8x0.ko
+  AUTOLOAD:=$(call AutoLoad,36,snd-intel8x0)

   $(call AddDepends/sound)
 endef
 
   $(call AddDepends/sound)
 endef
 


@@ -118,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.$(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)
+  FILES:=$(LINUX_DIR)/sound/pci/cs5535audio/snd-cs5535audio.ko
+  AUTOLOAD:=$(call AutoLoad,36,snd-cs5535audio)

   $(call AddDepends/sound)
 endef
 
   $(call AddDepends/sound)
 endef
 


@@ -144,3 +153,44 @@ define KernelPackage/sound-soc-core
 endef
 
 $(eval $(call KernelPackage,sound-soc-core))
 endef
 
 $(eval $(call KernelPackage,sound-soc-core))

+
+
+define KernelPackage/sound-soc-omap
+  TITLE:=OMAP SoC sound support
+  KCONFIG:= \
+       CONFIG_SND_OMAP_SOC
+  FILES:=$(LINUX_DIR)/sound/soc/omap/snd-soc-omap.ko
+  AUTOLOAD:=$(call AutoLoad,60,snd-soc-omap)
+  DEPENDS:=@TARGET_omap24xx +kmod-sound-soc-core
+  $(call AddDepends/sound)
+endef
+
+$(eval $(call KernelPackage,sound-soc-omap))
+
+
+define KernelPackage/sound-soc-omap-mcbsp
+  TITLE:=OMAP SoC MCBSP support
+  KCONFIG:= \
+       CONFIG_SND_OMAP_SOC_MCBSP
+  FILES:=$(LINUX_DIR)/sound/soc/omap/snd-soc-omap-mcbsp.ko
+  AUTOLOAD:=$(call AutoLoad,61,snd-soc-omap-mcbsp)
+  DEPENDS:=@TARGET_omap24xx +kmod-sound-soc-omap
+  $(call AddDepends/sound)
+endef
+
+$(eval $(call KernelPackage,sound-soc-omap-mcbsp))
+
+
+define KernelPackage/sound-soc-n810
+  TITLE:=Nokia n810 SoC sound support
+  KCONFIG:= \
+       CONFIG_SND_OMAP_SOC_N810
+  FILES:= \
+       $(LINUX_DIR)/sound/soc/codecs/snd-soc-tlv320aic3x.ko \
+       $(LINUX_DIR)/sound/soc/omap/snd-soc-n810.ko
+  AUTOLOAD:=$(call AutoLoad,65,snd-soc-tlv320aic3x snd-soc-n810)
+  DEPENDS:=@TARGET_omap24xx +kmod-sound-soc-omap +kmod-sound-soc-omap-mcbsp
+  $(call AddDepends/sound)
+endef
+
+$(eval $(call KernelPackage,sound-soc-n810))