diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-04-05 11:29:56 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-04-05 11:29:56 +0000 |
| commit | 92db2de729afe1fab41e5cd441b1db926bb8f07d (patch) | |
| tree | 938a9e2ac5b561ce728ba30450ffa87592eaacda | |
| parent | 4c29ee0335fb91afa71b413b7fe935c28516c0b2 (diff) | |
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
| -rw-r--r-- | package/kernel/modules/other.mk | 9 | ||||
| -rw-r--r-- | package/kernel/modules/usb.mk | 7 | ||||
| -rw-r--r-- | target/linux/brcm47xx-2.6/config/default | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index e60927f2f..2cea08f6a 100644 --- 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 bceba63d9..cffd05394 100644 --- 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 baeb14aab..37c40a8b8 100644 --- 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 |