Merge with /home/tmlind/src/kernel/linux-2.6

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

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 36cc9a96a3387c4d7619546cc36c1bd48bfcb675..1f4ad0e7836e6f89df5b192fd3cbab0a866556b6 100644 (file)
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -116,6 +116,31 @@ config YENTA
 
          If unsure, say Y.
 
 
          If unsure, say Y.
 

+config YENTA_O2
+       default y
+       bool "Special initialization for O2Micro bridges" if EMBEDDED
+       depends on YENTA
+
+config YENTA_RICOH
+       default y
+       bool "Special initialization for Ricoh bridges" if EMBEDDED
+       depends on YENTA
+
+config YENTA_TI
+       default y
+       bool "Special initialization for TI and EnE bridges" if EMBEDDED
+       depends on YENTA
+
+config YENTA_ENE_TUNE
+       default y
+       bool "Auto-tune EnE bridges for CB cards" if EMBEDDED
+       depends on YENTA_TI && CARDBUS
+
+config YENTA_TOSHIBA
+       default y
+       bool "Special initialization for Toshiba ToPIC bridges" if EMBEDDED
+       depends on YENTA
+

 config PD6729
        tristate "Cirrus PD6729 compatible bridge support"
        depends on PCMCIA && PCI
 config PD6729
        tristate "Cirrus PD6729 compatible bridge support"
        depends on PCMCIA && PCI


@@ -154,6 +179,16 @@ config TCIC
          "Bridge" is the name used for the hardware inside your computer that
          PCMCIA cards are plugged into. If unsure, say N.
 
          "Bridge" is the name used for the hardware inside your computer that
          PCMCIA cards are plugged into. If unsure, say N.
 

+config PCMCIA_M8XX
+        tristate "MPC8xx PCMCIA support"
+        depends on PCMCIA && PPC && 8xx 
+        select PCCARD_IODYN
+        help
+        Say Y here to include support for PowerPC 8xx series PCMCIA
+        controller.
+
+        This driver is also available as a module called m8xx_pcmcia.
+

 config HD64465_PCMCIA
        tristate "HD64465 host bridge support"
        depends on HD64465 && PCMCIA
 config HD64465_PCMCIA
        tristate "HD64465 host bridge support"
        depends on HD64465 && PCMCIA


@@ -190,7 +225,7 @@ config PCMCIA_PXA2XX
 
 config PCMCIA_PROBE
        bool
 
 config PCMCIA_PROBE
        bool

-       default y if ISA && !ARCH_SA1100 && !ARCH_CLPS711X
+       default y if ISA && !ARCH_SA1100 && !ARCH_CLPS711X && !PARISC

 
 config M32R_PCC
        bool "M32R PCMCIA I/F"
 
 config M32R_PCC
        bool "M32R PCMCIA I/F"


@@ -231,6 +266,9 @@ config OMAP_CF
 config PCCARD_NONSTATIC
        tristate
 
 config PCCARD_NONSTATIC
        tristate
 

+config PCCARD_IODYN
+       bool
+

 endif  # PCCARD
 
 endmenu
 endif  # PCCARD
 
 endmenu