Now that all architectures include drivers/pcmcia/Kconfig where the PCMCIA config is defined, the PCMCIA config entries in per-arch Kconfig files are redundant. Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx> --- I will queue this up to my kbuild tree along with Christoph's clean-up patch set. arch/s390/Kconfig | 3 --- arch/um/Kconfig | 3 --- 2 files changed, 6 deletions(-) diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 5173366..b212c59 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -837,9 +837,6 @@ source "kernel/power/Kconfig" endmenu -config PCMCIA - def_bool n - config CCW def_bool y diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 6b99389..a7d09a7 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -34,9 +34,6 @@ config SBUS config PCI bool -config PCMCIA - bool - config TRACE_IRQFLAGS_SUPPORT bool default y -- 2.7.4