diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /drivers/pcmcia/Kconfig | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
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, |