Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[linux-2.6] / sound / sparc / Kconfig

diff --git a/sound/sparc/Kconfig b/sound/sparc/Kconfig
index 2358df1c45a9e76d77399aabb5624164c6da339c..079e22af074c08cf45bdc0bc0559f327869dcce8 100644 (file)
--- a/sound/sparc/Kconfig
+++ b/sound/sparc/Kconfig
@@ -1,18 +1,36 @@
 # ALSA Sparc drivers
 
 menu "ALSA Sparc devices"
-       depends on SND!=n && (SPARC32 || SPARC64)
+       depends on SND!=n && SPARC
 
 config SND_SUN_AMD7930
        tristate "Sun AMD7930"
        depends on SBUS && SND
        select SND_PCM
+       help
+         Say Y here to include support for AMD7930 sound device on Sun.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-sun-amd7930.
 
-#  dep_tristate 'Sun DBRI' CONFIG_SND_SUN_DBRI $CONFIG_SND
 config SND_SUN_CS4231
        tristate "Sun CS4231"
        depends on SND
        select SND_PCM
+       help
+         Say Y here to include support for CS4231 sound device on Sun.
 
-endmenu
+         To compile this driver as a module, choose M here: the module
+         will be called snd-sun-cs4231.
+
+config SND_SUN_DBRI
+       tristate "Sun DBRI"
+       depends on SND && SBUS
+       select SND_PCM
+       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