merge 2.6.13-rc4 with ACPI's to-linus tree

1 files changed, 20 insertions, 2 deletions

diff --git a/sound/sparc/Kconfig b/sound/sparc/Kconfig
index 2358df1c45a9..25a8a558ef92 100644
--- a/sound/sparc/Kconfig
+++ b/sound/sparc/Kconfig
@@ -7,12 +7,30 @@ 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