From 679089c6a85a398508a584d437b42c546233a4a0 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 25 Nov 2007 17:15:30 +0000 Subject: [PATCH] work around kernel config issues with sound modules SVN-Revision: 9598 --- package/kernel/modules/sound.mk | 14 +++++--------- .../patches-2.6.23/220-sound_kconfig.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 target/linux/generic-2.6/patches-2.6.23/220-sound_kconfig.patch diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk index 78dd33469d..7faf387ba2 100644 --- a/package/kernel/modules/sound.mk +++ b/package/kernel/modules/sound.mk @@ -12,7 +12,7 @@ SOUND_MENU:=Sound Support define KernelPackage/sound-core SUBMENU:=$(SOUND_MENU) TITLE:=Sound support - DEPENDS:=@USB_SUPPORT @!TARGET_atheros + DEPENDS:=@USB_SUPPORT||PCI_SUPPORT @!TARGET_atheros KCONFIG:= \ CONFIG_SOUND \ CONFIG_SND \ @@ -20,6 +20,10 @@ define KernelPackage/sound-core 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 endef @@ -29,12 +33,6 @@ define KernelPackage/sound-core/2.4 endef define KernelPackage/sound-core/2.6 -# KCONFIG+= \ -# CONFIG_SND \ -# CONFIG_SND_HWDEP \ -# CONFIG_SND_RAWMIDI \ -# CONFIG_SND_TIMER \ -# CONFIG_SND_PCM FILES:= \ $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/sound/core/snd.$(LINUX_KMOD_SUFFIX) \ @@ -59,8 +57,6 @@ define KernelPackage/sound-core/2.6 endef define KernelPackage/sound-core/uml-2.6 -# KCONFIG+= \ -# CONFIG_HOSTAUDIO FILES:= \ $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX) diff --git a/target/linux/generic-2.6/patches-2.6.23/220-sound_kconfig.patch b/target/linux/generic-2.6/patches-2.6.23/220-sound_kconfig.patch new file mode 100644 index 0000000000..a7a48f2626 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.23/220-sound_kconfig.patch @@ -0,0 +1,13 @@ +Index: linux-2.6.23.1/sound/core/Kconfig +=================================================================== +--- linux-2.6.23.1.orig/sound/core/Kconfig 2007-11-25 18:14:23.486146184 +0100 ++++ linux-2.6.23.1/sound/core/Kconfig 2007-11-25 18:14:26.474316473 +0100 +@@ -9,7 +9,7 @@ + depends on SND + + config SND_HWDEP +- tristate ++ tristate "Sound hardware support" + depends on SND + + config SND_RAWMIDI -- 2.30.2