X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=sound%2FKconfig;h=200aca1faa7112f0413f3cd92ab0a55cec48f588;hb=1b36c78f26bfa74c1782be98acb827afa95c3b0c;hp=a37bee094eba4482c612612ae42366002e3b1134;hpb=3e370b29d35fb01bfb92c2814d6f79bf6a2cb970;p=linux-2.6-omap-h63xx.git

diff --git a/sound/Kconfig b/sound/Kconfig
index a37bee094eb..200aca1faa7 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -28,6 +28,10 @@ menuconfig SOUND
 
 if SOUND
 
+config SOUND_OSS_CORE
+	bool
+	default n
+
 source "sound/oss/dmasound/Kconfig"
 
 if !M68K
@@ -80,6 +84,7 @@ endif # SND
 
 menuconfig SOUND_PRIME
 	tristate "Open Sound System (DEPRECATED)"
+	select SOUND_OSS_CORE
 	help
 	  Say 'Y' or 'M' to enable Open Sound System drivers.
 
@@ -91,6 +96,9 @@ endif # SOUND_PRIME
 
 endif # !M68K
 
+endif # SOUND
+
+# AC97_BUS is used from both sound and ucb1400
 config AC97_BUS
 	tristate
 	help
@@ -99,4 +107,3 @@ config AC97_BUS
 	  sound although they're sharing the AC97 bus. Concerned drivers
 	  should "select" this.
 
-endif # SOUND