add missing modules for usb sound support on 2.6 (#1535)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6869 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index e60927f2f38156537988dd9aad26f96d66bddffd..2cea08f6af1b2539d02a0689ae316b4d9b758797 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -104,19 +104,22 @@ define KernelPackage/soundcore
   DESCRIPTION:=Kernel modules for sound support
   KCONFIG:=$(CONFIG_SOUND)
   SUBMENU:=$(EMENU)
-  AUTOLOAD:=$(call AutoLoad,30,soundcore)
 endef
 
 define KernelPackage/soundcore/2.4
   FILES:=$(MODULES_DIR)/kernel/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,soundcore)
 endef
 
 define KernelPackage/soundcore/2.6
-  FILES:=$(MODULES_DIR)/kernel/sound/soundcore.$(LINUX_KMOD_SUFFIX)
+  FILES:= \
+       $(MODULES_DIR)/kernel/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/sound/core/*.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/sound/core/oss/*.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,snd snd-page-alloc snd-hwdep snd-rawmidi snd-timer snd-pcm snd-mixer-oss snd-pcm-oss)
 endef
 $(eval $(call KernelPackage,soundcore))
 
-
 define KernelPackage/loop
   TITLE:=Loopback device support
   DESCRIPTION:=Kernel module for loopback device support

diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index bceba63d96e4544d881bc70b3e5bb9166f4f84d7..cffd05394b8f058eecb377d319880120a46926ca 100644 (file)
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -123,17 +123,20 @@ define KernelPackage/usb-audio
   $(call usbdep,+kmod-soundcore)
   TITLE:=Support for audio devices
   DESCRIPTION:=Kernel support for USB audio devices
-  AUTOLOAD:=$(call AutoLoad,60,audio)
 endef
 
 define KernelPackage/usb-audio/2.4
   KCONFIG:=$(CONFIG_USB_AUDIO)
   FILES:=$(MODULES_DIR)/kernel/drivers/usb/audio.o
+  AUTOLOAD:=$(call AutoLoad,60,audio)
 endef
 
 define KernelPackage/usb-audio/2.6
   KCONFIG:=$(CONFIG_SND_USB_AUDIO)
-  FILES:=$(MODULES_DIR)/kernel/sound/usb/snd-usb-audio.ko
+  FILES:= \
+       $(MODULES_DIR)/kernel/sound/usb/snd-usb-lib.ko \
+       $(MODULES_DIR)/kernel/sound/usb/snd-usb-audio.ko
+  AUTOLOAD:=$(call AutoLoad,60,snd-usb-lib snd-usb-audio)
 endef
 $(eval $(call KernelPackage,usb-audio))
 

diff --git a/target/linux/brcm47xx-2.6/config/default b/target/linux/brcm47xx-2.6/config/default
index baeb14aab157c9680a6829437d3a7d84a69a2fd0..37c40a8b87794c133cfc7590d803de5dbad2983f 100644 (file)
--- a/target/linux/brcm47xx-2.6/config/default
+++ b/target/linux/brcm47xx-2.6/config/default
@@ -252,8 +252,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_PCM_OSS is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SSB=y
 CONFIG_SSB_DEBUG=y