summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/Kconfig
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2005-06-27 16:28:47 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 18:03:18 -0700
commit9a5555b81fde402119a6b4f2b38d3373d272ff69 (patch)
tree68f5af92d99dc320e7d2954fd1173fa14780f8a8 /drivers/pcmcia/Kconfig
parent3c29976a6469b81a7858812dc2d4b8430d74004a (diff)
downloadlinux-3.10-9a5555b81fde402119a6b4f2b38d3373d272ff69.tar.gz
linux-3.10-9a5555b81fde402119a6b4f2b38d3373d272ff69.tar.bz2
linux-3.10-9a5555b81fde402119a6b4f2b38d3373d272ff69.zip
[PATCH] pcmcia: add a config option for the PCMICA ioctl
Add a new config option to control the building of the PCMCIA IOCTL. Currently, it is not yet made public, though the help text is there already. Signed-off-by: Dominik Brodowski <linux@dominikbrodowksi.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/pcmcia/Kconfig')
-rw-r--r--drivers/pcmcia/Kconfig28
1 files changed, 20 insertions, 8 deletions
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 22f7e8ca658..85af1fb2a30 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -14,8 +14,8 @@ config PCCARD
Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
computer. These are credit-card size devices such as network cards,
modems or hard drives often used with laptops computers. There are
- actually two varieties of these cards: the older 16 bit PCMCIA cards
- and the newer 32 bit CardBus cards.
+ actually two varieties of these cards: 16 bit PCMCIA and 32 bit
+ CardBus cards.
To compile this driver as modules, choose M here: the
module will be called pcmcia_core.
@@ -48,10 +48,9 @@ config PCMCIA
PC-cards are such 16-bit PCMCIA cards, so unless you know you're
only using 32-bit CardBus cards, say Y or M here.
- To use 16-bit PCMCIA cards, you will need supporting software from
- David Hinds' pcmcia-cs package (see the file <file:Documentation/Changes>
- for location). Please also read the PCMCIA-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
+ To use 16-bit PCMCIA cards, you will need supporting software in
+ most cases. (see the file <file:Documentation/Changes> for
+ location and details).
To compile this driver as modules, choose M here: the
module will be called pcmcia.
@@ -72,6 +71,21 @@ config PCMCIA_LOAD_CIS
If unsure, say Y.
+config PCMCIA_IOCTL
+ bool
+ depends on PCMCIA
+ default y
+ help
+ If you say Y here, the deprecated ioctl interface to the PCMCIA
+ subsystem will be built. It is needed by cardmgr and cardctl
+ (pcmcia-cs) to function properly.
+
+ If you do not use the new pcmciautils package, and have a
+ yenta, Cirrus PD6729, i82092, i82365 or tcic compatible bridge,
+ you need to say Y here to be able to use 16-bit PCMCIA cards.
+
+ If unsure, say Y.
+
config CARDBUS
bool "32-bit CardBus support"
depends on PCI
@@ -91,8 +105,6 @@ comment "PC-card bridges"
config YENTA
tristate "CardBus yenta-compatible bridge support"
- depends on PCI
-#fixme: remove dependendcy on CARDBUS
depends on CARDBUS
select PCCARD_NONSTATIC
---help---