x86: string_32.h: workaround for broken gcc 4.0

[linux-2.6-omap-h63xx.git] / sound / Kconfig

diff --git a/sound/Kconfig b/sound/Kconfig
index 97532bbc2ccba8fb301a6dfdd9991a3694012381..4247406160e7ef7c5684943a9c3065e1ec73eb9a 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
@@ -62,8 +58,14 @@ source "sound/aoa/Kconfig"
 
 source "sound/arm/Kconfig"
 
+if SPI
+source "sound/spi/Kconfig"
+endif
+
 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"