mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-29 17:22:07 +00:00
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>
This commit is contained in:
parent
20f1b79d33
commit
8fb71ef9b9
@ -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
|
||||
|
@ -1240,8 +1240,6 @@ config PCI_HOST_ITE8152
|
||||
default y
|
||||
select DMABOUNCE
|
||||
|
||||
source "drivers/pcmcia/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
||||
menu "Kernel Features"
|
||||
|
@ -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
|
||||
|
@ -68,6 +68,4 @@ if !MMU
|
||||
config ISA_DMA_API
|
||||
def_bool !M5272
|
||||
|
||||
source "drivers/pcmcia/Kconfig"
|
||||
|
||||
endif
|
||||
|
@ -3107,8 +3107,6 @@ config ZONE_DMA
|
||||
config ZONE_DMA32
|
||||
bool
|
||||
|
||||
source "drivers/pcmcia/Kconfig"
|
||||
|
||||
config HAS_RAPIDIO
|
||||
bool
|
||||
default n
|
||||
|
@ -939,8 +939,6 @@ config PCI_8260
|
||||
select PPC_INDIRECT_PCI
|
||||
default y
|
||||
|
||||
source "drivers/pcmcia/Kconfig"
|
||||
|
||||
config HAS_RAPIDIO
|
||||
bool
|
||||
|
||||
|
@ -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)"
|
||||
|
@ -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
|
||||
|
@ -117,12 +117,6 @@ config UNICORE_FPU_F64
|
||||
|
||||
endmenu
|
||||
|
||||
menu "Bus support"
|
||||
|
||||
source "drivers/pcmcia/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
||||
menu "Kernel Features"
|
||||
|
||||
source "kernel/Kconfig.hz"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -5,6 +5,7 @@ menu "Device Drivers"
|
||||
|
||||
source "drivers/amba/Kconfig"
|
||||
source "drivers/pci/Kconfig"
|
||||
source "drivers/pcmcia/Kconfig"
|
||||
|
||||
|
||||
source "drivers/base/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"
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user