--- zzzz-none-000/linux-2.4.17/drivers/pcmcia/Config.in	2001-11-09 22:03:11.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/drivers/pcmcia/Config.in	2004-11-24 13:23:45.000000000 +0000
@@ -14,6 +14,10 @@
 
 tristate 'PCMCIA/CardBus support' CONFIG_PCMCIA
 if [ "$CONFIG_PCMCIA" != "n" ]; then
+   # yes, I really mean the following...
+   if [ "$CONFIG_ISA" = "y" -o "$CONFIG_ARCH_SA1100" = "y" ]; then
+      define_bool CONFIG_PCMCIA_PROBE y
+   fi
    if [ "$CONFIG_PCI" != "n" ]; then
       bool '  CardBus support' CONFIG_CARDBUS
    fi
@@ -23,6 +27,18 @@
    if [ "$CONFIG_HD64465" = "y" ]; then
       dep_tristate '  HD64465 host bridge support' CONFIG_HD64465_PCMCIA $CONFIG_PCMCIA
    fi
+   if [ "$CONFIG_MIPS_AU1000" = "y" ]; then
+      dep_tristate '  Au1000 support' CONFIG_PCMCIA_AU1000 $CONFIG_PCMCIA $CONFIG_MIPS_PB1000
+      dep_tristate '  Au1500 support' CONFIG_PCMCIA_AU1500 $CONFIG_PCMCIA $CONFIG_MIPS_PB1500
+   fi
+   if [ "$CONFIG_ARM" = "y" ]; then
+      dep_tristate '  CLPS6700 support' CONFIG_PCMCIA_CLPS6700 $CONFIG_ARCH_CLPS711X $CONFIG_PCMCIA
+      dep_tristate '  SA1100 support' CONFIG_PCMCIA_SA1100 $CONFIG_ARCH_SA1100 $CONFIG_PCMCIA
+      dep_tristate '    Mercury BackPAQ' CONFIG_MERCURY_BACKPAQ $CONFIG_SA1100_H3XXX $CONFIG_H3600_SLEEVE
+      dep_tristate '  PXA250/210 support' CONFIG_PCMCIA_PXA $CONFIG_ARCH_PXA $CONFIG_PCMCIA
+   fi
+   if [ "$CONFIG_8xx" = "y" ]; then
+      dep_tristate '  m8xx support' CONFIG_PCMCIA_M8XX $CONFIG_PCMCIA
+   fi
 fi
-
 endmenu