mac80211: fill some important capabilities into ht_capab in the hostapd config

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

diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index af637df..f78cdfc 100644 (file)
--- a/package/kernel/modules/sound.mk
+++ b/package/kernel/modules/sound.mk
@@ -1,18 +1,16 @@
 #
 #

-# 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.
 #
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 SOUND_MENU:=Sound Support
 
 
 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
 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 \
   KCONFIG:= \
        CONFIG_SOUND \
        CONFIG_SND \


@@ -24,7 +22,9 @@ define KernelPackage/sound-core
        CONFIG_SND_VIRMIDI \
        CONFIG_SND_SEQ_DUMMY \
        CONFIG_SND_SEQUENCER_OSS=y \
        CONFIG_SND_VIRMIDI \
        CONFIG_SND_SEQ_DUMMY \
        CONFIG_SND_SEQUENCER_OSS=y \

-       CONFIG_HOSTAUDIO
+       CONFIG_HOSTAUDIO \
+       CONFIG_SND_PCM_OSS \
+       CONFIG_SND_MIXER_OSS

 endef
 
 define KernelPackage/sound-core/2.4
 endef
 
 define KernelPackage/sound-core/2.4


@@ -32,19 +32,8 @@ define KernelPackage/sound-core/2.4
   AUTOLOAD:=$(call AutoLoad,30,soundcore)
 endef
 
   AUTOLOAD:=$(call AutoLoad,30,soundcore)
 endef
 

-define KernelPackage/sound-core/2.6
-  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) \
-       $(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, \
+# allow 2.6 targets to override the soundcore stuff
+SOUNDCORE_LOAD ?= \

        soundcore \
        snd \
        snd-page-alloc \
        soundcore \
        snd \
        snd-page-alloc \


@@ -53,9 +42,24 @@ define KernelPackage/sound-core/2.6
        snd-rawmidi \
        snd-timer \
        snd-pcm \
        snd-rawmidi \
        snd-timer \
        snd-pcm \

-       $(if $(CONFIG_SND_MIXER_OSS),snd-mixer-oss) \
-       $(if $(CONFIG_SND_PCM_OSS),snd-pcm-oss) \
-  )
+       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))

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


@@ -88,6 +92,23 @@ endef
 
 $(eval $(call KernelPackage,sound-i8x0))
 
 
 $(eval $(call KernelPackage,sound-i8x0))
 

+define KernelPackage/sound-ps3
+  SUBMENU:=$(SOUND_MENU)
+  TITLE:=PS3 Audio
+  DEPENDS:=kmod-sound-core @TARGET_ps3
+  KCONFIG:=CONFIG_SND_PS3 \
+               CONFIG_SND_PPC=y \
+               CONFIG_SND_PS3_DEFAULT_START_DELAY=2000
+  FILES:=$(LINUX_DIR)/sound/ppc/snd_ps3.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,35, snd_ps3)
+endef
+
+define KernelPackage/sound-ps3/description
+ support for the integrated PS3 audio device
+endef
+
+$(eval $(call KernelPackage,sound-ps3))
+

 define KernelPackage/sound-cs5535audio
   SUBMENU:=$(SOUND_MENU)
   TITLE:=CS5535 PCI Controller
 define KernelPackage/sound-cs5535audio
   SUBMENU:=$(SOUND_MENU)
   TITLE:=CS5535 PCI Controller