Patched in Tegra support.

1 files changed, 8 insertions, 10 deletions

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 8fd255f7ee4..6e318ce4113 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -155,14 +155,18 @@ config PCMCIA_M8XX
 
           This driver is also available as a module called m8xx_pcmcia.
 
+config PCMCIA_AU1X00
+        tristate "Au1x00 pcmcia support"
+        depends on MIPS_ALCHEMY && PCMCIA
+
 config PCMCIA_ALCHEMY_DEVBOARD
         tristate "Alchemy Db/Pb1xxx PCMCIA socket services"
         depends on MIPS_ALCHEMY && 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, DB1300
-          board.  NOT suitable for the PB1000!
+          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
 
@@ -183,14 +187,10 @@ config PCMCIA_BCM63XX
 config PCMCIA_SOC_COMMON
         tristate
 
-config PCMCIA_SA11XX_BASE
-        tristate
-
 config PCMCIA_SA1100
         tristate "SA1100 support"
         depends on ARM && ARCH_SA1100 && PCMCIA
         select PCMCIA_SOC_COMMON
-        select PCMCIA_SA11XX_BASE
         help
           Say Y here to include support for SA11x0-based PCMCIA or CF
           sockets, found on HP iPAQs, Yopy, and other StrongARM(R)/
@@ -200,9 +200,8 @@ config PCMCIA_SA1100
 
 config PCMCIA_SA1111
         tristate "SA1111 support"
-        depends on ARM && SA1111 && PCMCIA
+        depends on ARM && ARCH_SA1100 && SA1111 && PCMCIA
         select PCMCIA_SOC_COMMON
-        select PCMCIA_SA11XX_BASE if ARCH_SA1100
         help
           Say Y  here to include support for SA1111-based PCMCIA or CF
           sockets, found on the Jornada 720, Graphicsmaster and other
@@ -217,8 +216,7 @@ config PCMCIA_PXA2XX
                     || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \
                     || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2 \
                     || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI \
-                    || MACH_COLIBRI320 || MACH_H4700)
-        select PCMCIA_SA1111 if ARCH_LUBBOCK && SA1111
+                    || MACH_COLIBRI320)
         select PCMCIA_SOC_COMMON
         help
           Say Y here to include support for the PXA2xx PCMCIA controller