[NETFILTER]: nf_conntrack/nf_nat: add TFTP helper port

[powerpc.git] / drivers / pcmcia / Kconfig

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 36cc9a9..35f8864 100644 (file)
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -6,7 +6,7 @@ menu "PCCARD (PCMCIA/CardBus) support"
 
 config PCCARD
        tristate "PCCard (PCMCIA/CardBus) support"
 
 config PCCARD
        tristate "PCCard (PCMCIA/CardBus) support"

-       select HOTPLUG
+       depends on HOTPLUG

        ---help---
          Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
          computer.  These are credit-card size devices such as network cards,
        ---help---
          Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
          computer.  These are credit-card size devices such as network cards,


@@ -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"


@@ -215,7 +250,7 @@ config M32R_CFC_NUM
 
 config PCMCIA_VRC4171
        tristate "NEC VRC4171 Card Controllers support"
 
 config PCMCIA_VRC4171
        tristate "NEC VRC4171 Card Controllers support"

-       depends on VRC4171 && PCMCIA
+       depends on CPU_VR41XX && ISA && PCMCIA

 
 config PCMCIA_VRC4173
        tristate "NEC VRC4173 CARDU support"
 
 config PCMCIA_VRC4173
        tristate "NEC VRC4173 CARDU support"


@@ -228,9 +263,19 @@ config OMAP_CF
          Say Y here to support the CompactFlash controller on OMAP.
          Note that this doesn't support "True IDE" mode.
 
          Say Y here to support the CompactFlash controller on OMAP.
          Note that this doesn't support "True IDE" mode.
 

+config AT91_CF
+       tristate "AT91 CompactFlash Controller"
+       depends on PCMCIA && ARCH_AT91RM9200
+       help
+         Say Y here to support the CompactFlash controller on AT91 chips.
+         Or choose M to compile the driver as a module named "at91_cf".
+

 config PCCARD_NONSTATIC
        tristate
 
 config PCCARD_NONSTATIC
        tristate
 

+config PCCARD_IODYN
+       bool
+

 endif  # PCCARD
 
 endmenu
 endif  # PCCARD
 
 endmenu