X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fpcmcia%2FKconfig;h=5e0ea6ff877ce41018fe87ff2d938c3bb7b40620;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=8a4007516ff4d469a7996dc211541d59ba154c51;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 8a4007516..5e0ea6ff8 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -5,30 +5,24 @@ # by the integrated kernel driver. # -menu "PCMCIA/CardBus support" - depends on HOTPLUG +menu "PCCARD (PCMCIA/CardBus) support" -config PCMCIA - tristate "PCMCIA/CardBus support" +config PCCARD + tristate "PCCard (PCMCIA/CardBus) support" + select HOTPLUG ---help--- 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. If you want to use CardBus - cards, you need to say Y here and also to "CardBus support" below. - - To use your PC-cards, you will need supporting software from David - Hinds' pcmcia-cs package (see the file - for location). Please also read the PCMCIA-HOWTO, available from - . + and the newer 32 bit CardBus cards. To compile this driver as modules, choose M here: the - modules will be called pcmcia_core and ds. + module will be called pcmcia_core. config PCMCIA_DEBUG - bool "Enable PCMCIA debugging" - depends on PCMCIA != n + bool "Enable PCCARD debugging" + depends on PCCARD != n help Say Y here to enable PCMCIA subsystem debugging. You will need to choose the debugging level either via the @@ -45,33 +39,63 @@ config PCMCIA_DEBUG In all the above examples, N is the debugging verbosity level. -config YENTA - tristate "CardBus yenta-compatible bridge support" - depends on PCMCIA && PCI +config PCMCIA + tristate "16-bit PCMCIA support" + depends on PCCARD + default y + ---help--- + This option enables support for 16-bit PCMCIA cards. Most older + 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 + for location). Please also read the PCMCIA-HOWTO, available from + . + + To compile this driver as modules, choose M here: the + module will be called pcmcia. + + If unsure, say Y. + +config CARDBUS + bool "32-bit CardBus support" + depends on PCCARD && PCI + default y ---help--- CardBus is a bus mastering architecture for PC-cards, which allows for 32 bit PC-cards (the original PCMCIA standard specifies only a 16 bit wide bus). Many newer PC-cards are actually CardBus cards. - This option enables support for CardBus PC Cards, as well as support - for CardBus host bridges. Virtually all modern PCMCIA bridges are - CardBus compatible. A "bridge" is the hardware inside your computer - that PCMCIA cards are plugged into. - - To use your PC-cards, you will need supporting software from David - Hinds' pcmcia-cs package (see the file - for location). + To use 32 bit PC-cards, you also need a CardBus compatible host + bridge. Virtually all modern PCMCIA bridges do this, and most of + them are "yenta-compatible", so say Y or M there, too. If unsure, say Y. -config CARDBUS - bool - depends on YENTA - default y if YENTA +comment "PC-card bridges" + +config YENTA + tristate "CardBus yenta-compatible bridge support" + depends on PCCARD && PCI +#fixme: remove dependendcy on CARDBUS + depends on CARDBUS + select PCCARD_NONSTATIC + ---help--- + This option enables support for CardBus host bridges. Virtually + all modern PCMCIA bridges are CardBus compatible. A "bridge" is + the hardware inside your computer that PCMCIA cards are plugged + into. + + To compile this driver as modules, choose M here: the + module will be called yenta_socket. + + If unsure, say Y. config PD6729 tristate "Cirrus PD6729 compatible bridge support" depends on PCMCIA && PCI + select PCCARD_NONSTATIC help This provides support for the Cirrus PD6729 PCI-to-PCMCIA bridge device, found in some older laptops and PCMCIA card readers. @@ -79,6 +103,7 @@ config PD6729 config I82092 tristate "i82092 compatible bridge support" depends on PCMCIA && PCI + select PCCARD_NONSTATIC help This provides support for the Intel I82092AA PCI-to-PCMCIA bridge device, found in some older laptops and more commonly in evaluation boards for the @@ -87,6 +112,7 @@ config I82092 config I82365 tristate "i82365 compatible bridge support" depends on PCMCIA && ISA + select PCCARD_NONSTATIC help Say Y here to include support for ISA-bus PCMCIA host bridges that are register compatible with the Intel i82365. These are found on @@ -97,6 +123,7 @@ config I82365 config TCIC tristate "Databook TCIC host bridge support" depends on PCMCIA + select PCCARD_NONSTATIC help Say Y here to include support for the Databook TCIC family of PCMCIA host bridges. These are only found on a handful of old systems. @@ -107,6 +134,10 @@ config HD64465_PCMCIA tristate "HD64465 host bridge support" depends on HD64465 && PCMCIA +config PCMCIA_AU1X00 + tristate "Au1x00 pcmcia support" + depends on SOC_AU1X00 && PCMCIA + config PCMCIA_SA1100 tristate "SA1100 support" depends on ARM && ARCH_SA1100 && PCMCIA @@ -133,10 +164,39 @@ config PCMCIA_PXA2XX help Say Y here to include support for the PXA2xx PCMCIA controller - config PCMCIA_PROBE bool default y if ISA && !ARCH_SA1100 && !ARCH_CLPS711X -endmenu +config M32R_PCC + bool "M32R PCMCIA I/F" + depends on M32R && CHIP_M32700 && PCMCIA + help + Say Y here to use the M32R PCMCIA controller. +config M32R_CFC + bool "M32R CF I/F Controller" + depends on M32R && (PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_OPSPUT) + help + Say Y here to use the M32R CompactFlash controller. + +config M32R_CFC_NUM + int "M32R CF I/F number" + depends on M32R_CFC + default "1" if PLAT_USRV || PLAT_M32700UT || PLAT_MAPPI2 || PLAT_OPSPUT + help + Set the number of M32R CF slots. + +config PCMCIA_VRC4171 + tristate "NEC VRC4171 Card Controllers support" + depends on VRC4171 && PCMCIA + +config PCMCIA_VRC4173 + tristate "NEC VRC4173 CARDU support" + depends on CPU_VR41XX && PCI && PCMCIA + +config PCCARD_NONSTATIC + tristate + depends on PCCARD + +endmenu