1 files changed, 3 insertions, 22 deletions

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index d189e4743e69..d0f5ad306078 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -49,26 +49,6 @@ config PCMCIA_LOAD_CIS
 
           If unsure, say Y.
 
-config PCMCIA_IOCTL
-        bool "PCMCIA control ioctl (obsolete)"
-        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 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).
-
-          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"
         depends on PCI
@@ -234,7 +214,8 @@ config PCMCIA_PXA2XX
         depends on ARM && ARCH_PXA && PCMCIA
         depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \
                     || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \
-                    || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2)
+                    || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2 \
+                    || MACH_VPAC270)
         select PCMCIA_SOC_COMMON
         help
           Say Y here to include support for the PXA2xx PCMCIA controller
@@ -317,7 +298,7 @@ config ELECTRA_CF
           PA Semi Electra eval board.
 
 config PCCARD_NONSTATIC
-        tristate
+        bool
 
 config PCCARD_IODYN
         bool