X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=sound%2FKconfig;h=8ebf512ced6caacee8f0f0a8aafa80772e530889;hb=fdb0ac80618729e6b12121c66449b8532990eaf3;hp=d8f11408ce274a2b2c67256d0ec07d3c3a828bdd;hpb=4b0940f8117b6cdf7e7c27bdecc29931f18c81ed;p=safe%2Fjmp%2Flinux-2.6

diff --git a/sound/Kconfig b/sound/Kconfig
index d8f1140..8ebf512 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,34 +26,21 @@ 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
 
 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/>
 
-config SND_AC97_CODEC
-	tristate
-	select SND_PCM
-	select SND_AC97_BUS
-
-config SND_AC97_BUS
-	tristate
+if SND
 
 source "sound/core/Kconfig"
 
@@ -66,15 +52,21 @@ source "sound/pci/Kconfig"
 
 source "sound/ppc/Kconfig"
 
+source "sound/aoa/Kconfig"
+
 source "sound/arm/Kconfig"
 
+source "sound/spi/Kconfig"
+
 source "sound/mips/Kconfig"
 
-# the following will depenend on the order of config.
+source "sound/sh/Kconfig"
+
+# the following will depend on the order of config.
 # here assuming USB is defined before ALSA
 source "sound/usb/Kconfig"
 
-# the following will depenend on the order of config.
+# the following will depend on the order of config.
 # here assuming PCMCIA is defined before ALSA
 source "sound/pcmcia/Kconfig"
 
@@ -82,21 +74,31 @@ source "sound/sparc/Kconfig"
 
 source "sound/parisc/Kconfig"
 
-endmenu
+source "sound/soc/Kconfig"
 
-menu "Open Sound System"
-	depends on SOUND!=n
+endif # SND
 
-config SOUND_PRIME
+menuconfig SOUND_PRIME
 	tristate "Open Sound System (DEPRECATED)"
-	depends on SOUND
 	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
+	  This is used to avoid config and link hard dependencies between the
+	  sound subsystem and other function drivers completely unrelated to
+	  sound although they're sharing the AC97 bus. Concerned drivers
+	  should "select" this.
 
-endmenu