drm/rs690: set base 2 to 0.

[safe/jmp/linux-2.6] / sound / Kconfig

diff --git a/sound/Kconfig b/sound/Kconfig
index 047d59e..4247406 100644 (file)
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -2,6 +2,7 @@
 #
 
 menu "Sound"
+       depends on HAS_IOMEM
 
 config SOUND
        tristate "Sound card support"
@@ -27,11 +28,6 @@ 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/>.
-
 source "sound/oss/dmasound/Kconfig"
 
 if !M68K
@@ -42,6 +38,11 @@ menu "Advanced Linux Sound Architecture"
 config 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/>
 
 source "sound/core/Kconfig"
 
@@ -53,15 +54,23 @@ source "sound/pci/Kconfig"
 
 source "sound/ppc/Kconfig"
 
+source "sound/aoa/Kconfig"
+
 source "sound/arm/Kconfig"
 
+if SPI
+source "sound/spi/Kconfig"
+endif
+
 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"
 
@@ -69,10 +78,12 @@ source "sound/sparc/Kconfig"
 
 source "sound/parisc/Kconfig"
 
+source "sound/soc/Kconfig"
+
 endmenu
 
 menu "Open Sound System"
-       depends on SOUND!=n && (BROKEN || (!SPARC32 && !SPARC64))
+       depends on SOUND!=n
 
 config SOUND_PRIME
        tristate "Open Sound System (DEPRECATED)"
@@ -86,4 +97,12 @@ endmenu
 
 endif
 
+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