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

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

diff --git a/sound/sparc/Kconfig b/sound/sparc/Kconfig
index ef022a8..d75deba 100644 (file)
--- a/sound/sparc/Kconfig
+++ b/sound/sparc/Kconfig
@@ -1,13 +1,18 @@
 # ALSA Sparc drivers
 
-menu "ALSA Sparc devices"
-       depends on SND!=n && SPARC
+menuconfig SND_SPARC
+       bool "Sparc sound devices"
+       depends on SPARC
+       default y
+       help
+         Support for sound devices specific to Sun SPARC architectures.
+
+if SND_SPARC
 
 config SND_SUN_AMD7930
        tristate "Sun AMD7930"
-       depends on SBUS && SND
+       depends on SBUS
        select SND_PCM
-       select SND_GENERIC_DRIVER
        help
          Say Y here to include support for AMD7930 sound device on Sun.
 
@@ -16,9 +21,7 @@ config SND_SUN_AMD7930
 
 config SND_SUN_CS4231
        tristate "Sun CS4231"
-       depends on SND
        select SND_PCM
-       select SND_GENERIC_DRIVER
        help
          Say Y here to include support for CS4231 sound device on Sun.
 
@@ -27,13 +30,12 @@ config SND_SUN_CS4231
 
 config SND_SUN_DBRI
        tristate "Sun DBRI"
-       depends on SND && SBUS
+       depends on SBUS
        select SND_PCM
-       select SND_GENERIC_DRIVER
        help
          Say Y here to include support for DBRI sound device on Sun.
 
          To compile this driver as a module, choose M here: the module
          will be called snd-sun-dbri.
 
-endmenu
+endif  # SND_SPARC