Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6

[linux-2.6-omap-h63xx.git] / sound / parisc / Kconfig

diff --git a/sound/parisc/Kconfig b/sound/parisc/Kconfig
index a5a7f9d75d051e37398b094a2e42100adbf19029..9b61d95010f07134e481eed1a481d77d13d8ca88 100644 (file)
--- a/sound/parisc/Kconfig
+++ b/sound/parisc/Kconfig
@@ -1,15 +1,20 @@
 # ALSA PA-RISC drivers
 
-menu "GSC devices"
-       depends on SND!=n && GSC
+menuconfig SND_GSC
+       bool "GSC sound devices"
+       depends on GSC
+       default y
+       help
+         Support for GSC sound devices on PA-RISC architectures.
+
+if SND_GSC
 
 config SND_HARMONY
        tristate "Harmony/Vivace sound chip"
-       depends on SND
        select SND_PCM
        help
          Say 'Y' or 'M' to include support for the Harmony/Vivace sound
          chip found in most GSC-based PA-RISC workstations.  It's frequently
          provided as part of the Lasi multi-function IC.
 
-endmenu
+endif  # SND_GSC