Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / sound / sparc / Kconfig

diff --git a/sound/sparc/Kconfig b/sound/sparc/Kconfig
index f0fce1daf67ddceb1b98339d20a23c898de73881..25a8a558ef92b6ab201099e5e487556bba397bf7 100644 (file)
--- a/sound/sparc/Kconfig
+++ b/sound/sparc/Kconfig
@@ -13,7 +13,6 @@ config SND_SUN_AMD7930
          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
@@ -24,5 +23,14 @@ config SND_SUN_CS4231
          To compile this driver as a module, choose M here: the module
          will be called snd-sun-cs4231.
 
-endmenu
+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