Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[sfrench/cifs-2.6.git] / sound / Kconfig

diff --git a/sound/Kconfig b/sound/Kconfig
index 97532bbc2ccba8fb301a6dfdd9991a3694012381..b2a2db47aff54820e02a635655f4c06ce8a92b1a 100644 (file)
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -2,6 +2,7 @@
 #
 
 menu "Sound"
+       depends on HAS_IOMEM
 
 config SOUND
        tristate "Sound card support"
@@ -62,8 +63,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"