pcmcia: avoid pccard_validate_cis failure in resume callpath

[safe/jmp/linux-2.6] / drivers / pcmcia / Kconfig

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 44b324b..d189e47 100644 (file)
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -51,17 +51,23 @@ config PCMCIA_LOAD_CIS
 
 config PCMCIA_IOCTL
        bool "PCMCIA control ioctl (obsolete)"
-       depends on PCMCIA
+       depends on PCMCIA && ARM && !SMP && !PREEMPT
        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.
+         subsystem will be built. It is needed by the deprecated pcmcia-cs
+         tools (cardmgr, cardctl) to function properly.
 
          You should use the new pcmciautils package instead (see
          <file:Documentation/Changes> for location and details).
 
-         If unsure, say Y.
+         This config option will most likely be removed from kernel 2.6.35,
+         the associated code from kernel 2.6.36.
+
+         As the PCMCIA ioctl is not locking safe, it depends on !SMP and
+         !PREEMPT.
+
+         If unsure, say N.
 
 config CARDBUS
        bool "32-bit CardBus support"
@@ -84,7 +90,7 @@ config YENTA
        tristate "CardBus yenta-compatible bridge support"
        depends on PCI
        select CARDBUS if !EMBEDDED
-       select PCCARD_NONSTATIC
+       select PCCARD_NONSTATIC if PCMCIA != n
        ---help---
          This option enables support for CardBus host bridges.  Virtually
          all modern PCMCIA bridges are CardBus compatible.  A "bridge" is
@@ -161,8 +167,8 @@ config TCIC
 
 config PCMCIA_M8XX
        tristate "MPC8xx PCMCIA support"
-       depends on PCMCIA && PPC && 8xx
-       select PCCARD_IODYN
+       depends on PCCARD && PPC && 8xx
+       select PCCARD_IODYN if PCMCIA != n
        help
          Say Y here to include support for PowerPC 8xx series PCMCIA
          controller.
@@ -173,6 +179,27 @@ config PCMCIA_AU1X00
        tristate "Au1x00 pcmcia support"
        depends on SOC_AU1X00 && PCMCIA
 
+config PCMCIA_ALCHEMY_DEVBOARD
+       tristate "Alchemy Db/Pb1xxx PCMCIA socket services"
+       depends on SOC_AU1X00 && PCMCIA
+       select 64BIT_PHYS_ADDR
+       help
+         Enable this driver of you want PCMCIA support on your Alchemy
+         Db1000, Db/Pb1100, Db/Pb1500, Db/Pb1550, Db/Pb1200 board.
+         NOT suitable for the PB1000!
+
+         This driver is also available as a module called db1xxx_ss.ko
+
+config PCMCIA_XXS1500
+       tristate "MyCable XXS1500 PCMCIA socket support"
+       depends on PCMCIA && MIPS_XXS1500
+       select 64BIT_PHYS_ADDR
+       help
+         Support for the PCMCIA/CF socket interface on MyCable XXS1500
+         systems.
+
+         This driver is also available as a module called xxs1500_ss.ko
+
 config PCMCIA_BCM63XX
        tristate "bcm63xx pcmcia support"
        depends on BCM63XX && PCMCIA