diff options
author | Paul Mackerras <paulus@samba.org> | 2006-05-05 05:45:48 (GMT) |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-05-05 05:45:48 (GMT) |
commit | f18fc729cd2d67b76e24206ee3567c1f6983c358 (patch) | |
tree | 9dbf177222d94213d9dd82d67de6d905e1a2b278 /sound/pcmcia | |
parent | 5a43ee65620d628ba04deecf241b63b2410b97f2 (diff) | |
parent | d98550e334715b2d9e45f8f0f4e1608720108640 (diff) | |
download | linux-fsl-qoriq-f18fc729cd2d67b76e24206ee3567c1f6983c358.tar.xz |
Merge ../linux-2.6
Diffstat (limited to 'sound/pcmcia')
-rw-r--r-- | sound/pcmcia/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pcmcia/Kconfig b/sound/pcmcia/Kconfig index 5d1b0b7..c9fa1a2 100644 --- a/sound/pcmcia/Kconfig +++ b/sound/pcmcia/Kconfig @@ -5,7 +5,7 @@ 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 and @@ -16,7 +16,7 @@ config SND_VXPOCKET 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 |