X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/04c5f00031ce37d3c03254f982ca5d0d61a8bcfc..d9d6100edd9b4229398ffc177bd3aff826308377:/package/kernel/modules/sound.mk?ds=sidebyside

diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index f78cdfc4b..0e7cefe56 100644
--- a/package/kernel/modules/sound.mk
+++ b/package/kernel/modules/sound.mk
@@ -10,7 +10,7 @@ SOUND_MENU:=Sound Support
 define KernelPackage/sound-core
   SUBMENU:=$(SOUND_MENU)
   TITLE:=Sound support
-  DEPENDS:=@PCI_SUPPORT||USB_SUPPORT
+  DEPENDS:=@PCI_SUPPORT||USB_SUPPORT||TARGET_uml
   KCONFIG:= \
 	CONFIG_SOUND \
 	CONFIG_SND \
@@ -24,7 +24,8 @@ define KernelPackage/sound-core
 	CONFIG_SND_SEQUENCER_OSS=y \
 	CONFIG_HOSTAUDIO \
 	CONFIG_SND_PCM_OSS \
-	CONFIG_SND_MIXER_OSS
+	CONFIG_SND_MIXER_OSS \
+	CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 endef
 
 define KernelPackage/sound-core/2.4
@@ -62,7 +63,7 @@ define KernelPackage/sound-core/2.6
   AUTOLOAD:=$(call AutoLoad,30,$(SOUNDCORE_LOAD))
 endef
 
-define KernelPackage/sound-core/uml-2.6
+define KernelPackage/sound-core/uml
   FILES:= \
 	$(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX)
@@ -78,7 +79,7 @@ $(eval $(call KernelPackage,sound-core))
 define KernelPackage/sound-i8x0
   SUBMENU:=$(SOUND_MENU)
   TITLE:=Intel/SiS/nVidia/AMD/ALi AC97 Controller
-  DEPENDS:=kmod-sound-core
+  DEPENDS:=kmod-sound-core @!TARGET_uml
   KCONFIG:=CONFIG_SND_INTEL8X0
   FILES:=$(LINUX_DIR)/sound/pci/snd-intel8x0.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,35,snd-i8x0)
@@ -95,7 +96,7 @@ $(eval $(call KernelPackage,sound-i8x0))
 define KernelPackage/sound-ps3
   SUBMENU:=$(SOUND_MENU)
   TITLE:=PS3 Audio
-  DEPENDS:=kmod-sound-core @TARGET_ps3
+  DEPENDS:=kmod-sound-core @TARGET_ps3||@TARGET_ps3chk
   KCONFIG:=CONFIG_SND_PS3 \
 		CONFIG_SND_PPC=y \
 		CONFIG_SND_PS3_DEFAULT_START_DELAY=2000
@@ -112,7 +113,7 @@ $(eval $(call KernelPackage,sound-ps3))
 define KernelPackage/sound-cs5535audio
   SUBMENU:=$(SOUND_MENU)
   TITLE:=CS5535 PCI Controller
-  DEPENDS:=kmod-sound-core
+  DEPENDS:=kmod-sound-core @!TARGET_uml
   KCONFIG:=CONFIG_SND_CS5535AUDIO
   FILES:=$(LINUX_DIR)/sound/pci/cs5535audio/snd-cs5535audio.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/sound/ac97_bus.$(LINUX_KMOD_SUFFIX) \