ACPICA: Dump table header - suppress output of non-printable characters

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

diff --git a/sound/Kconfig b/sound/Kconfig
index fe17515..1eceb85 100644 (file)
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -1,10 +1,9 @@
 # sound/Config.in
 #
 
 # sound/Config.in
 #
 

-menu "Sound"
-
-config SOUND
+menuconfig SOUND

        tristate "Sound card support"
        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
        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,26 +26,25 @@ config SOUND
          and read <file:Documentation/sound/oss/README.modules>; the module
          will be called soundcore.
 
          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
 
 
 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"
        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.
 
        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/
+         For more information, see <http://www.alsa-project.org/>
+
+if SND

 
 source "sound/core/Kconfig"
 
 
 source "sound/core/Kconfig"
 


@@ -58,15 +56,23 @@ source "sound/pci/Kconfig"
 
 source "sound/ppc/Kconfig"
 
 
 source "sound/ppc/Kconfig"
 

+source "sound/aoa/Kconfig"
+

 source "sound/arm/Kconfig"
 
 source "sound/arm/Kconfig"
 

+source "sound/atmel/Kconfig"
+
+source "sound/spi/Kconfig"
+

 source "sound/mips/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"
 
 # 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"
 
 # here assuming PCMCIA is defined before ALSA
 source "sound/pcmcia/Kconfig"
 


@@ -74,21 +80,32 @@ source "sound/sparc/Kconfig"
 
 source "sound/parisc/Kconfig"
 
 
 source "sound/parisc/Kconfig"
 

-endmenu
+source "sound/soc/Kconfig"

 
 

-menu "Open Sound System"
-       depends on SOUND!=n && (BROKEN || (!SPARC32 && !SPARC64))
+endif # SND

 
 

-config SOUND_PRIME
+menuconfig SOUND_PRIME

        tristate "Open Sound System (DEPRECATED)"
        tristate "Open Sound System (DEPRECATED)"

-       depends on SOUND
+       select SOUND_OSS_CORE

        help
          Say 'Y' or 'M' to enable Open Sound System drivers.
 
        help
          Say 'Y' or 'M' to enable Open Sound System drivers.
 

+if SOUND_PRIME
+

 source "sound/oss/Kconfig"
 
 source "sound/oss/Kconfig"
 

-endmenu
+endif # SOUND_PRIME

 
 

-endif
+endif # !M68K
+
+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