VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

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

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 71b6ac4..8a40075 100644 (file)
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -69,6 +69,13 @@ config CARDBUS
        depends on YENTA
        default y if YENTA
 
+config PD6729
+       tristate "Cirrus PD6729 compatible bridge support"
+       depends on PCMCIA && PCI
+       help
+         This provides support for the Cirrus PD6729 PCI-to-PCMCIA bridge
+         device, found in some older laptops and PCMCIA card readers.
+
 config I82092
        tristate "i82092 compatible bridge support"
        depends on PCMCIA && PCI
@@ -120,6 +127,13 @@ config PCMCIA_SA1111
 
          This driver is also available as a module called sa1111_cs.
 
+config PCMCIA_PXA2XX
+       tristate "PXA2xx support"
+       depends on ARM && ARCH_PXA && PCMCIA
+       help
+         Say Y here to include support for the PXA2xx PCMCIA controller
+
+
 config PCMCIA_PROBE
        bool
        default y if ISA && !ARCH_SA1100 && !ARCH_CLPS711X