pcmcia: allow PCMCIA support independent of the architecture

There is nothing architecture specific in the PCMCIA core, so allow
building it everywhere.  The actual host controllers will depend on ISA,
PCI or a specific SOC.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Paul Burton <paul.burton@mips.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 1f679508bc34bef8f243427bf78adf3a0c6ac704..0ff180ab2a42bcf4845b38e528a1d63e43567ca8 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -669,8 +669,6 @@ config HZ
 
 source "drivers/eisa/Kconfig"
 
-source "drivers/pcmcia/Kconfig"
-
 config SRM_ENV
        tristate "SRM environment through procfs"
        depends on PROC_FS

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2b45ed887edd5cd79aee5650288be1a6b106038e..b8a10105463e5da082e15de5913bdfd780ccbe30 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1240,8 +1240,6 @@ config PCI_HOST_ITE8152
        default y
        select DMABOUNCE
 
-source "drivers/pcmcia/Kconfig"
-
 endmenu
 
 menu "Kernel Features"

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 8f18d90c933dd1c924ab3944e35732e233657508..887e7bfd7055747babe28ca4d3d9996fedc73d3e 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -542,16 +542,6 @@ endif
 
 endmenu
 
-if !IA64_HP_SIM
-
-menu "Bus options (PCI, PCMCIA)"
-
-source "drivers/pcmcia/Kconfig"
-
-endmenu
-
-endif
-
 source "arch/ia64/hp/sim/Kconfig"
 
 config MSPEC

diff --git a/arch/m68k/Kconfig.bus b/arch/m68k/Kconfig.bus
index 8cb0604b195bb4ce50158e718f0d3fb0bd736c55..9d0a3a23d50e5259cf07795b28bca10fcc266270 100644 (file)
--- a/arch/m68k/Kconfig.bus
+++ b/arch/m68k/Kconfig.bus
@@ -68,6 +68,4 @@ if !MMU
 config ISA_DMA_API
         def_bool !M5272
 
-source "drivers/pcmcia/Kconfig"
-
 endif

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 151a4aaf0610ca755cca3139ab939394e8d75210..3912250ff813792701da94adb6860a4d0896f54c 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -3107,8 +3107,6 @@ config ZONE_DMA
 config ZONE_DMA32
        bool
 
-source "drivers/pcmcia/Kconfig"
-
 config HAS_RAPIDIO
        bool
        default n

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index cbdcd1c0b1e0a67e036d2994ed52de1ec106f983..cc8435d879490ff18611bcb475dee058a408f02b 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -939,8 +939,6 @@ config PCI_8260
        select PPC_INDIRECT_PCI
        default y
 
-source "drivers/pcmcia/Kconfig"
-
 config HAS_RAPIDIO
        bool
 

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 8a3c292ae906598f8bce65f8c0f514047bf2cbad..44a45a37a3c4bd120c0afe170cbd3aade0e14920 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -855,8 +855,6 @@ config MAPLE
         Dreamcast with a serial line terminal or a remote network
         connection.
 
-source "drivers/pcmcia/Kconfig"
-
 endmenu
 
 menu "Power management options (EXPERIMENTAL)"

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 20417b8b12a53cdc0bfabbe5faec15c6191f3d35..daee2c73b6c55a2e71818b137c04dd627dbbee54 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -503,8 +503,6 @@ config SPARC_GRPCI2
        help
          Say Y here to include the GRPCI2 Host Bridge Driver.
 
-source "drivers/pcmcia/Kconfig"
-
 config SUN_OPENPROMFS
        tristate "Openprom tree appears in /proc/openprom"
        help

diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 4658859c6aeecb119e177d65974c87c793aece76..96ac6cc6ab2a7e405774d01ce06187c9e7289dab 100644 (file)
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -117,12 +117,6 @@ config UNICORE_FPU_F64
 
 endmenu
 
-menu "Bus support"
-
-source "drivers/pcmcia/Kconfig"
-
-endmenu
-
 menu "Kernel Features"
 
 source "kernel/Kconfig.hz"

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 953db09165c2a7d9a6c5d3d787c55c3ea12c3b40..659d59d7f033754b76f42199923e5c44af7b8bf4 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2811,8 +2811,6 @@ config AMD_NB
        def_bool y
        depends on CPU_SUP_AMD && PCI
 
-source "drivers/pcmcia/Kconfig"
-
 config RAPIDIO
        tristate "RapidIO support"
        depends on PCI

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 2865a556163a5b24f67dc97de86aa8fc519ffb47..322b7391de891322dc004a11b20eaa80832c29fa 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -512,8 +512,6 @@ config FORCE_MAX_ZONEORDER
          This config option is actually maximum order plus one. For example,
          a value of 11 means that the largest free memory block is 2^10 pages.
 
-source "drivers/pcmcia/Kconfig"
-
 config PLATFORM_WANT_DEFAULT_MEM
        def_bool n
 

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 059573823387234c550e19045af2107f0ed87ae7..58ee88c36cf57637683fefd5a8e68d2cb968a66c 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -5,6 +5,7 @@ menu "Device Drivers"
 
 source "drivers/amba/Kconfig"
 source "drivers/pci/Kconfig"
+source "drivers/pcmcia/Kconfig"
 
 
 source "drivers/base/Kconfig"

diff --git a/drivers/parisc/Kconfig b/drivers/parisc/Kconfig
index 5bbfea1a019c82cf4794dca0e3e82d24bf63615f..1a55763d12452f0acb5dc6d714a3e38cbec32191 100644 (file)
--- a/drivers/parisc/Kconfig
+++ b/drivers/parisc/Kconfig
@@ -92,8 +92,6 @@ config IOMMU_SBA
        depends on PCI_LBA
        default PCI_LBA
 
-source "drivers/pcmcia/Kconfig"
-
 endmenu
 
 menu "PA-RISC specific drivers"

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index cbbe4a285b48905564ca3127efad8630ac8e13e3..c9bdbb463a7ee36b8115820a7e5b2db83f82c98d 100644 (file)
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -4,6 +4,7 @@
 
 menuconfig PCCARD
        tristate "PCCard (PCMCIA/CardBus) support"
+       depends on !UML
        ---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,