diff options
Diffstat (limited to 'drivers/pcmcia/Kconfig')
-rw-r--r-- | drivers/pcmcia/Kconfig | 43 |
1 files changed, 35 insertions, 8 deletions
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 14e4124e1523..52ea34594363 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig | |||
@@ -14,8 +14,8 @@ config PCCARD | |||
14 | Say Y here if you want to attach PCMCIA- or PC-cards to your Linux | 14 | Say Y here if you want to attach PCMCIA- or PC-cards to your Linux |
15 | computer. These are credit-card size devices such as network cards, | 15 | computer. These are credit-card size devices such as network cards, |
16 | modems or hard drives often used with laptops computers. There are | 16 | modems or hard drives often used with laptops computers. There are |
17 | actually two varieties of these cards: the older 16 bit PCMCIA cards | 17 | actually two varieties of these cards: 16 bit PCMCIA and 32 bit |
18 | and the newer 32 bit CardBus cards. | 18 | CardBus cards. |
19 | 19 | ||
20 | To compile this driver as modules, choose M here: the | 20 | To compile this driver as modules, choose M here: the |
21 | module will be called pcmcia_core. | 21 | module will be called pcmcia_core. |
@@ -42,22 +42,51 @@ config PCMCIA_DEBUG | |||
42 | 42 | ||
43 | config PCMCIA | 43 | config PCMCIA |
44 | tristate "16-bit PCMCIA support" | 44 | tristate "16-bit PCMCIA support" |
45 | select CRC32 | ||
45 | default y | 46 | default y |
46 | ---help--- | 47 | ---help--- |
47 | This option enables support for 16-bit PCMCIA cards. Most older | 48 | This option enables support for 16-bit PCMCIA cards. Most older |
48 | PC-cards are such 16-bit PCMCIA cards, so unless you know you're | 49 | PC-cards are such 16-bit PCMCIA cards, so unless you know you're |
49 | only using 32-bit CardBus cards, say Y or M here. | 50 | only using 32-bit CardBus cards, say Y or M here. |
50 | 51 | ||
51 | To use 16-bit PCMCIA cards, you will need supporting software from | 52 | To use 16-bit PCMCIA cards, you will need supporting software in |
52 | David Hinds' pcmcia-cs package (see the file <file:Documentation/Changes> | 53 | most cases. (see the file <file:Documentation/Changes> for |
53 | for location). Please also read the PCMCIA-HOWTO, available from | 54 | location and details). |
54 | <http://www.tldp.org/docs.html#howto>. | ||
55 | 55 | ||
56 | To compile this driver as modules, choose M here: the | 56 | To compile this driver as modules, choose M here: the |
57 | module will be called pcmcia. | 57 | module will be called pcmcia. |
58 | 58 | ||
59 | If unsure, say Y. | 59 | If unsure, say Y. |
60 | 60 | ||
61 | config PCMCIA_LOAD_CIS | ||
62 | bool "Load CIS updates from userspace (EXPERIMENTAL)" | ||
63 | depends on PCMCIA && EXPERIMENTAL | ||
64 | select FW_LOADER | ||
65 | default y | ||
66 | help | ||
67 | Some PCMCIA cards require an updated Card Information Structure (CIS) | ||
68 | to be loaded from userspace to work correctly. If you say Y here, | ||
69 | and your userspace is arranged correctly, this will be loaded | ||
70 | automatically using the in-kernel firmware loader and the hotplug | ||
71 | subsystem, instead of relying on cardmgr from pcmcia-cs to do so. | ||
72 | |||
73 | If unsure, say Y. | ||
74 | |||
75 | config PCMCIA_IOCTL | ||
76 | bool | ||
77 | depends on PCMCIA | ||
78 | default y | ||
79 | help | ||
80 | If you say Y here, the deprecated ioctl interface to the PCMCIA | ||
81 | subsystem will be built. It is needed by cardmgr and cardctl | ||
82 | (pcmcia-cs) to function properly. | ||
83 | |||
84 | If you do not use the new pcmciautils package, and have a | ||
85 | yenta, Cirrus PD6729, i82092, i82365 or tcic compatible bridge, | ||
86 | you need to say Y here to be able to use 16-bit PCMCIA cards. | ||
87 | |||
88 | If unsure, say Y. | ||
89 | |||
61 | config CARDBUS | 90 | config CARDBUS |
62 | bool "32-bit CardBus support" | 91 | bool "32-bit CardBus support" |
63 | depends on PCI | 92 | depends on PCI |
@@ -77,8 +106,6 @@ comment "PC-card bridges" | |||
77 | 106 | ||
78 | config YENTA | 107 | config YENTA |
79 | tristate "CardBus yenta-compatible bridge support" | 108 | tristate "CardBus yenta-compatible bridge support" |
80 | depends on PCI | ||
81 | #fixme: remove dependendcy on CARDBUS | ||
82 | depends on CARDBUS | 109 | depends on CARDBUS |
83 | select PCCARD_NONSTATIC | 110 | select PCCARD_NONSTATIC |
84 | ---help--- | 111 | ---help--- |