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

[pandora-kernel.git] / sound / mips / Kconfig

diff --git a/sound/mips/Kconfig b/sound/mips/Kconfig
index 2433b77..a9823fa 100644 (file)
--- a/sound/mips/Kconfig
+++ b/sound/mips/Kconfig
@@ -1,16 +1,34 @@
 # ALSA MIPS drivers
 
-menu "ALSA MIPS devices"
-       depends on SND!=n && MIPS
+menuconfig SND_MIPS
+       bool "MIPS sound devices"
+       depends on MIPS
+       default y
+       help
+         Support for sound devices of MIPS architectures.
+
+if SND_MIPS
+
+config SND_SGI_O2
+       tristate "SGI O2 Audio"
+       depends on SGI_IP32
+        help
+                Sound support for the SGI O2 Workstation. 
+
+config SND_SGI_HAL2
+        tristate "SGI HAL2 Audio"
+        depends on SGI_HAS_HAL2
+        help
+                Sound support for the SGI Indy and Indigo2 Workstation.
+
 
 config SND_AU1X00
        tristate "Au1x00 AC97 Port Driver"
-       depends on (SOC_AU1000 || SOC_AU1100 || SOC_AU1500) && SND
+       depends on SOC_AU1000 || SOC_AU1100 || SOC_AU1500
        select SND_PCM
        select SND_AC97_CODEC
-       select SND_GENERIC_DRIVER
        help
          ALSA Sound driver for the Au1x00's AC97 port.
 
-endmenu
+endif  # SND_MIPS