Merge branch 'for_paulus' of git://git.kernel.org/pub/scm/linux/kernel/git/galak...

[linux-2.6] / drivers / pcmcia / Kconfig

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index ea00b1f3cb44bc22e9057e7b1eebcdbd1d49a9f7..1f4ad0e7836e6f89df5b192fd3cbab0a866556b6 100644 (file)
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -182,7 +182,7 @@ config TCIC
 config PCMCIA_M8XX
         tristate "MPC8xx PCMCIA support"
         depends on PCMCIA && PPC && 8xx 
-        select PCCARD_NONSTATIC
+        select PCCARD_IODYN
         help
         Say Y here to include support for PowerPC 8xx series PCMCIA
         controller.
@@ -225,7 +225,7 @@ config PCMCIA_PXA2XX
 
 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"
@@ -266,6 +266,9 @@ config OMAP_CF
 config PCCARD_NONSTATIC
        tristate
 
+config PCCARD_IODYN
+       bool
+
 endif  # PCCARD
 
 endmenu