X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3e9e4f8c3208ca1afb211af35eab1a4382f9d1a7..9fbe9e1ad0dc0df121c0c9d3354349202e6060b2:/package/kernel/modules/sound.mk?ds=inline

diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index 1b9b81a72..60864b105 100644
--- a/package/kernel/modules/sound.mk
+++ b/package/kernel/modules/sound.mk
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 SOUND_MENU:=Sound Support
 
@@ -23,7 +22,9 @@ define KernelPackage/sound-core
 	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
@@ -41,8 +42,8 @@ SOUNDCORE_LOAD ?= \
 	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) \
@@ -53,8 +54,8 @@ SOUNDCORE_FILES ?= \
 	$(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))
+	$(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)
@@ -96,7 +97,7 @@ define KernelPackage/sound-ps3
   TITLE:=PS3 Audio
   DEPENDS:=kmod-sound-core
   KCONFIG:=CONFIG_SND_PS3 \
-		CONFIG_SND_PPC
+		CONFIG_SND_PPC=y
   FILES:=$(LINUX_DIR)/sound/ppc/snd_ps3.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,35, snd_ps3)
 endef