diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 08:30:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 08:30:35 -0400 |
| commit | edc4ff7c08e9885c40e60c4fb39fa42cc91a0602 (patch) | |
| tree | f375d28043dd4457428a841167dc93d760ba9a46 /sound/pcmcia | |
| parent | cbb9a56177b16294ed347ba7fcb1c66c8adb5dc4 (diff) | |
| parent | e17df688f7064dae1417ce425dd1e4b71d24d63b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/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 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 |