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

[~andy/linux] / sound / pcmcia / Kconfig

diff --git a/sound/pcmcia/Kconfig b/sound/pcmcia/Kconfig
index 3611e298834f58882ce552b61328a3336a038fde..c9fa1a2bc58b852e3e4680589d6c1b1b71f6145b 100644 (file)
--- a/sound/pcmcia/Kconfig
+++ b/sound/pcmcia/Kconfig
@@ -5,29 +5,18 @@ menu "PCMCIA devices"
 
 config SND_VXPOCKET
        tristate "Digigram VXpocket"
-       depends on SND && PCMCIA && ISA
+       depends on SND && PCMCIA
        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
+       depends on SND && PCMCIA
        select SND_PCM
        help
          Say Y here to include support for Sound Core PDAudioCF