1 files changed, 24 insertions, 6 deletions

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 9f3adbd9f700..0a6601c76809 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -84,7 +84,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,9 +161,8 @@ config TCIC
 
 config PCMCIA_M8XX
         tristate "MPC8xx PCMCIA support"
-        depends on PCMCIA && PPC && 8xx
-        select PCCARD_IODYN
-        select PCCARD_NONSTATIC
+        depends on PCCARD && PPC && 8xx
+        select PCCARD_IODYN if PCMCIA != n
         help
           Say Y here to include support for PowerPC 8xx series PCMCIA
           controller.
@@ -174,6 +173,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
@@ -238,14 +258,12 @@ config PCMCIA_PROBE
 config M32R_PCC
         bool "M32R PCMCIA I/F"
         depends on M32R && CHIP_M32700 && PCMCIA
-        select PCCARD_NONSTATIC
         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_MAPPI3 || PLAT_OPSPUT)
-        select PCCARD_NONSTATIC
         help
           Say Y here to use the M32R CompactFlash controller.