diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
| commit | 0612ec48762bf8712db1925b2e67246d2237ebab (patch) | |
| tree | 01b0d69c9c9915015c0f23ad4263646dd5413e99 /drivers/pcmcia/Kconfig | |
| parent | 4263cf0fac28122c8381b6f4f9441a43cd93c81f (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/pcmcia/Kconfig')
| -rw-r--r-- | drivers/pcmcia/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 61cb4b29f55c..35f88649d3b7 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig | |||
| @@ -6,7 +6,7 @@ menu "PCCARD (PCMCIA/CardBus) support" | |||
| 6 | 6 | ||
| 7 | config PCCARD | 7 | config PCCARD |
| 8 | tristate "PCCard (PCMCIA/CardBus) support" | 8 | tristate "PCCard (PCMCIA/CardBus) support" |
| 9 | select HOTPLUG | 9 | depends on HOTPLUG |
| 10 | ---help--- | 10 | ---help--- |
| 11 | Say Y here if you want to attach PCMCIA- or PC-cards to your Linux | 11 | Say Y here if you want to attach PCMCIA- or PC-cards to your Linux |
| 12 | computer. These are credit-card size devices such as network cards, | 12 | computer. These are credit-card size devices such as network cards, |