regression: disable timer peek-ahead for 2.6.28

[linux-2.6-omap-h63xx.git] / drivers / pcmcia / Kconfig

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index e45402adac3f89e233ae1a4ebbcf6e0619e4d2dd..222904411a13a02ef83db412704a40b7d3863ee5 100644 (file)
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -188,10 +188,6 @@ config PCMCIA_M8XX
 
          This driver is also available as a module called m8xx_pcmcia.
 
-config HD64465_PCMCIA
-       tristate "HD64465 host bridge support"
-       depends on HD64465 && PCMCIA
-
 config PCMCIA_AU1X00
        tristate "Au1x00 pcmcia support"
        depends on SOC_AU1X00 && PCMCIA
@@ -219,7 +215,9 @@ config PCMCIA_SA1111
 config PCMCIA_PXA2XX
        tristate "PXA2xx support"
        depends on ARM && ARCH_PXA && PCMCIA
-       depends on ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL || MACH_ARMCORE
+       depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \
+                   || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \
+                   || ARCH_VIPER)
        help
          Say Y here to include support for the PXA2xx PCMCIA controller