diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-05 16:50:23 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-05 16:50:23 -0400 |
| commit | aad61439e6a00bdb72cb649e11f6e166590c5f66 (patch) | |
| tree | 2279f3c2a15f81526d14182c6acb358cafd0b359 /sound/pcmcia/Kconfig | |
| parent | 3c304956755fa63ee80ca51ce38078fe1c4e8818 (diff) | |
| parent | d98550e334715b2d9e45f8f0f4e1608720108640 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'sound/pcmcia/Kconfig')
| -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 5d1b0b762efa..c9fa1a2bc58b 100644 --- a/sound/pcmcia/Kconfig +++ b/sound/pcmcia/Kconfig | |||
| @@ -5,7 +5,7 @@ menu "PCMCIA devices" | |||
| 5 | 5 | ||
| 6 | config SND_VXPOCKET | 6 | config SND_VXPOCKET |
| 7 | tristate "Digigram VXpocket" | 7 | tristate "Digigram VXpocket" |
| 8 | depends on SND && PCMCIA && ISA | 8 | depends on SND && PCMCIA |
| 9 | select SND_VX_LIB | 9 | select SND_VX_LIB |
| 10 | help | 10 | help |
| 11 | Say Y here to include support for Digigram VXpocket and | 11 | Say Y here to include support for Digigram VXpocket and |
| @@ -16,7 +16,7 @@ config SND_VXPOCKET | |||
| 16 | 16 | ||
| 17 | config SND_PDAUDIOCF | 17 | config SND_PDAUDIOCF |
| 18 | tristate "Sound Core PDAudioCF" | 18 | tristate "Sound Core PDAudioCF" |
| 19 | depends on SND && PCMCIA && ISA | 19 | depends on SND && PCMCIA |
| 20 | select SND_PCM | 20 | select SND_PCM |
| 21 | help | 21 | help |
| 22 | Say Y here to include support for Sound Core PDAudioCF | 22 | Say Y here to include support for Sound Core PDAudioCF |