diff options
Diffstat (limited to 'drivers/pcmcia/Kconfig')
| -rw-r--r-- | drivers/pcmcia/Kconfig | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 3bb49252a098..45f67c63d385 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig | |||
| @@ -69,8 +69,7 @@ config YENTA | |||
| 69 | tristate "CardBus yenta-compatible bridge support" | 69 | tristate "CardBus yenta-compatible bridge support" |
| 70 | depends on PCI | 70 | depends on PCI |
| 71 | select CARDBUS if !EXPERT | 71 | select CARDBUS if !EXPERT |
| 72 | select PCCARD_NONSTATIC if PCMCIA != n && ISA | 72 | select PCCARD_NONSTATIC if PCMCIA != n |
| 73 | select PCCARD_PCI if PCMCIA !=n && !ISA | ||
| 74 | ---help--- | 73 | ---help--- |
| 75 | This option enables support for CardBus host bridges. Virtually | 74 | This option enables support for CardBus host bridges. Virtually |
| 76 | all modern PCMCIA bridges are CardBus compatible. A "bridge" is | 75 | all modern PCMCIA bridges are CardBus compatible. A "bridge" is |
| @@ -110,8 +109,7 @@ config YENTA_TOSHIBA | |||
| 110 | config PD6729 | 109 | config PD6729 |
| 111 | tristate "Cirrus PD6729 compatible bridge support" | 110 | tristate "Cirrus PD6729 compatible bridge support" |
| 112 | depends on PCMCIA && PCI | 111 | depends on PCMCIA && PCI |
| 113 | select PCCARD_NONSTATIC if PCMCIA != n && ISA | 112 | select PCCARD_NONSTATIC |
| 114 | select PCCARD_PCI if PCMCIA !=n && !ISA | ||
| 115 | help | 113 | help |
| 116 | This provides support for the Cirrus PD6729 PCI-to-PCMCIA bridge | 114 | This provides support for the Cirrus PD6729 PCI-to-PCMCIA bridge |
| 117 | device, found in some older laptops and PCMCIA card readers. | 115 | device, found in some older laptops and PCMCIA card readers. |
| @@ -119,8 +117,7 @@ config PD6729 | |||
| 119 | config I82092 | 117 | config I82092 |
| 120 | tristate "i82092 compatible bridge support" | 118 | tristate "i82092 compatible bridge support" |
| 121 | depends on PCMCIA && PCI | 119 | depends on PCMCIA && PCI |
| 122 | select PCCARD_NONSTATIC if PCMCIA != n && ISA | 120 | select PCCARD_NONSTATIC |
| 123 | select PCCARD_PCI if PCMCIA !=n && !ISA | ||
| 124 | help | 121 | help |
| 125 | This provides support for the Intel I82092AA PCI-to-PCMCIA bridge device, | 122 | This provides support for the Intel I82092AA PCI-to-PCMCIA bridge device, |
| 126 | found in some older laptops and more commonly in evaluation boards for the | 123 | found in some older laptops and more commonly in evaluation boards for the |
| @@ -291,9 +288,6 @@ config ELECTRA_CF | |||
| 291 | Say Y here to support the CompactFlash controller on the | 288 | Say Y here to support the CompactFlash controller on the |
| 292 | PA Semi Electra eval board. | 289 | PA Semi Electra eval board. |
| 293 | 290 | ||
| 294 | config PCCARD_PCI | ||
| 295 | bool | ||
| 296 | |||
| 297 | config PCCARD_NONSTATIC | 291 | config PCCARD_NONSTATIC |
| 298 | bool | 292 | bool |
| 299 | 293 | ||
