Merge tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux

[cascardo/linux.git] / sound / pcmcia / Kconfig

diff --git a/sound/pcmcia/Kconfig b/sound/pcmcia/Kconfig
index 3611e29..7fbb190 100644 (file)
--- a/sound/pcmcia/Kconfig
+++ b/sound/pcmcia/Kconfig
@@ -1,33 +1,26 @@
 # ALSA PCMCIA drivers
 
-menu "PCMCIA devices"
-       depends on SND!=n && PCMCIA
+menuconfig SND_PCMCIA
+       bool "PCMCIA sound devices"
+       depends on PCMCIA
+       default y
+       help
+         Support for sound devices connected via the PCMCIA bus.
+
+if SND_PCMCIA && PCMCIA
 
 config SND_VXPOCKET
        tristate "Digigram VXpocket"
-       depends on SND && PCMCIA && ISA
        select SND_VX_LIB
        help
-         Say Y here to include support for Digigram VXpocket
-         soundcards.
+         Say Y here to include support for Digigram VXpocket and
+         VXpocket 440 soundcards.
 
          To compile this driver as a module, choose M here: the module
          will be called snd-vxpocket.
 
-config SND_VXP440
-       tristate "Digigram VXpocket 440"
-       depends on SND && PCMCIA && ISA
-       select SND_VX_LIB
-       help
-         Say Y here to include support for Digigram VXpocket 440
-         soundcards.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-vxp440.
-
 config SND_PDAUDIOCF
        tristate "Sound Core PDAudioCF"
-       depends on SND && PCMCIA && ISA
        select SND_PCM
        help
          Say Y here to include support for Sound Core PDAudioCF
@@ -36,4 +29,5 @@ config SND_PDAUDIOCF
          To compile this driver as a module, choose M here: the module
          will be called snd-pdaudiocf.
 
-endmenu
+endif  # SND_PCMCIA
+