From eb01d42a77785ff96b6e66a2a2e7027fc6d78e4a Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Thu, 15 Nov 2018 20:05:32 +0100 Subject: PCI: consolidate PCI config entry in drivers/pci There is no good reason to duplicate the PCI menu in every architecture. Instead provide a selectable HAVE_PCI symbol that indicates availability of PCI support, and a FORCE_PCI symbol to for PCI on and the handle the rest in drivers/pci. Signed-off-by: Christoph Hellwig Reviewed-by: Palmer Dabbelt Acked-by: Max Filippov Acked-by: Thomas Gleixner Acked-by: Bjorn Helgaas Acked-by: Geert Uytterhoeven Acked-by: Paul Burton Signed-off-by: Masahiro Yamada --- arch/um/Kconfig | 3 --- 1 file changed, 3 deletions(-) (limited to 'arch/um') diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 6b9938919f0b..de982541a059 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -31,9 +31,6 @@ config ISA config SBUS bool -config PCI - bool - config PCMCIA bool -- cgit v1.2.3 From 5cfc879caee810828d90aec808d85560f34f02af Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 26 Nov 2018 17:15:41 +0900 Subject: pcmcia: remove per-arch PCMCIA config entry 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 Reviewed-by: Christoph Hellwig Acked-by: Dominik Brodowski --- arch/s390/Kconfig | 3 --- arch/um/Kconfig | 3 --- 2 files changed, 6 deletions(-) (limited to 'arch/um') diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 22a0c364b31d..ab0db50ce0b1 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -828,9 +828,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 de982541a059..a238547671d6 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -31,9 +31,6 @@ config ISA config SBUS bool -config PCMCIA - bool - config TRACE_IRQFLAGS_SUPPORT bool default y -- cgit v1.2.3