X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=sound%2FKconfig;h=1eceb85287c5f8197a25fe4a326c25b5dbf8e5be;hb=cf02cd47d4747abf8ff0617e15fc05a00202e6d5;hp=97532bbc2ccba8fb301a6dfdd9991a3694012381;hpb=a3288176de3fdd439d9bca0a0b9ca749c12ac5ac;p=safe%2Fjmp%2Flinux-2.6

diff --git a/sound/Kconfig b/sound/Kconfig
index 97532bb..1eceb85 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -1,10 +1,9 @@
 # sound/Config.in
 #
 
-menu "Sound"
-
-config SOUND
+menuconfig SOUND
 	tristate "Sound card support"
+	depends on HAS_IOMEM
 	help
 	  If you have a sound card in your computer, i.e. if it can say more
 	  than an occasional beep, say Y.  Be sure to have all the information
@@ -27,27 +26,26 @@ config SOUND
 	  and read <file:Documentation/sound/oss/README.modules>; the module
 	  will be called soundcore.
 
-	  I'm told that even without a sound card, you can make your computer
-	  say more than an occasional beep, by programming the PC speaker.
-	  Kernel patches and supporting utilities to do that are in the pcsp
-	  package, available at <ftp://ftp.infradead.org/pub/pcsp/>.
+if SOUND
+
+config SOUND_OSS_CORE
+	bool
+	default n
 
 source "sound/oss/dmasound/Kconfig"
 
 if !M68K
 
-menu "Advanced Linux Sound Architecture"
-	depends on SOUND!=n
-
-config SND
+menuconfig SND
 	tristate "Advanced Linux Sound Architecture"
-	depends on SOUND
 	help
 	  Say 'Y' or 'M' to enable ALSA (Advanced Linux Sound Architecture),
 	  the new base sound system.
 
 	  For more information, see <http://www.alsa-project.org/>
 
+if SND
+
 source "sound/core/Kconfig"
 
 source "sound/drivers/Kconfig"
@@ -62,8 +60,14 @@ source "sound/aoa/Kconfig"
 
 source "sound/arm/Kconfig"
 
+source "sound/atmel/Kconfig"
+
+source "sound/spi/Kconfig"
+
 source "sound/mips/Kconfig"
 
+source "sound/sh/Kconfig"
+
 # the following will depend on the order of config.
 # here assuming USB is defined before ALSA
 source "sound/usb/Kconfig"
@@ -78,23 +82,25 @@ source "sound/parisc/Kconfig"
 
 source "sound/soc/Kconfig"
 
-endmenu
-
-menu "Open Sound System"
-	depends on SOUND!=n
+endif # SND
 
-config SOUND_PRIME
+menuconfig SOUND_PRIME
 	tristate "Open Sound System (DEPRECATED)"
-	depends on SOUND
+	select SOUND_OSS_CORE
 	help
 	  Say 'Y' or 'M' to enable Open Sound System drivers.
 
+if SOUND_PRIME
+
 source "sound/oss/Kconfig"
 
-endmenu
+endif # SOUND_PRIME
+
+endif # !M68K
 
-endif
+endif # SOUND
 
+# AC97_BUS is used from both sound and ucb1400
 config AC97_BUS
 	tristate
 	help
@@ -103,4 +109,3 @@ config AC97_BUS
 	  sound although they're sharing the AC97 bus. Concerned drivers
 	  should "select" this.
 
-endmenu