Merge tag 'kconfig-v4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiro...

[linux-2.6-block.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 4385fc9174e1f280c179ae5b7020adf0cde2a57c..e260460210e17a6009097542d15b8797e596b1d6 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -145,6 +145,7 @@ config X86
        select HAVE_DYNAMIC_FTRACE_WITH_REGS
        select HAVE_EBPF_JIT
        select HAVE_EFFICIENT_UNALIGNED_ACCESS
+       select HAVE_EISA
        select HAVE_EXIT_THREAD
        select HAVE_FENTRY                      if X86_64 || DYNAMIC_FTRACE
        select HAVE_FTRACE_MCOUNT_RECORD
@@ -178,6 +179,7 @@ config X86
        select HAVE_PERF_EVENTS
        select HAVE_PERF_EVENTS_NMI
        select HAVE_HARDLOCKUP_DETECTOR_PERF    if PERF_EVENTS && HAVE_PERF_EVENTS_NMI
+       select HAVE_PCI
        select HAVE_PERF_REGS
        select HAVE_PERF_USER_STACK_DUMP
        select HAVE_RCU_TABLE_FREE              if PARAVIRT
@@ -194,6 +196,7 @@ config X86
        select HOTPLUG_SMT                      if SMP
        select IRQ_FORCED_THREADING
        select NEED_SG_DMA_LENGTH
+       select PCI_DOMAINS                      if PCI
        select PCI_LOCKLESS_CONFIG
        select PERF_EVENTS
        select RTC_LIB
@@ -2574,15 +2577,6 @@ endmenu
 
 menu "Bus options (PCI etc.)"
 
-config PCI
-       bool "PCI support"
-       default y
-       ---help---
-         Find out whether you have a PCI motherboard. PCI is the name of a
-         bus system, i.e. the way the CPU talks to the other stuff inside
-         your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
-         VESA. If you have PCI, say Y, otherwise N.
-
 choice
        prompt "PCI access mode"
        depends on X86_32 && PCI
@@ -2644,10 +2638,6 @@ config PCI_XEN
        depends on PCI && XEN
        select SWIOTLB_XEN
 
-config PCI_DOMAINS
-       def_bool y
-       depends on PCI
-
 config MMCONF_FAM10H
        def_bool y
        depends on X86_64 && PCI_MMCONFIG && ACPI
@@ -2665,8 +2655,6 @@ config PCI_CNB20LE_QUIRK
 
          You should say N unless you know you need this.
 
-source "drivers/pci/Kconfig"
-
 config ISA_BUS
        bool "ISA bus support on modern systems" if EXPERT
        help
@@ -2697,24 +2685,6 @@ config ISA
          (MCA) or VESA.  ISA is an older system, now being displaced by PCI;
          newer boards don't support it.  If you have ISA, say Y, otherwise N.
 
-config EISA
-       bool "EISA support"
-       depends on ISA
-       ---help---
-         The Extended Industry Standard Architecture (EISA) bus was
-         developed as an open alternative to the IBM MicroChannel bus.
-
-         The EISA bus provided some of the features of the IBM MicroChannel
-         bus while maintaining backward compatibility with cards made for
-         the older ISA bus.  The EISA bus saw limited use between 1988 and
-         1995 when it was made obsolete by the PCI bus.
-
-         Say Y here if you are building a kernel for an EISA-based machine.
-
-         Otherwise, say N.
-
-source "drivers/eisa/Kconfig"
-
 config SCx200
        tristate "NatSemi SCx200 support"
        ---help---
@@ -2826,17 +2796,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
-       help
-         If enabled this option will include drivers and the core
-         infrastructure code to support RapidIO interconnect devices.
-
-source "drivers/rapidio/Kconfig"
-
 config X86_SYSFB
        bool "Mark VGA/VBE/EFI FB as generic system framebuffer"
        help