PCI: Include pci/hotplug Kconfig directly from pci/Kconfig

Include pci/hotplug/Kconfig directly from pci/Kconfig, so arches don't
have to source both pci/Kconfig and pci/hotplug/Kconfig.

Note that this effectively adds pci/hotplug/Kconfig to the following
arches, because they already sourced drivers/pci/Kconfig but they
previously did not source drivers/pci/hotplug/Kconfig:

  alpha
  arm
  avr32
  frv
  m68k
  microblaze
  mn10300
  sparc
  unicore32

Inspired-by-patch-from: Bogicevic Sasa <brutallesale@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 128ec3c8d47500bfcb2792293de1187c9026cbed..fc8089db20b1ae9d3f0f8b8ff7790f61fa3a8103 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -235,7 +235,6 @@ config PCI_SYSCALL
        def_bool PCI
 
 source "drivers/pci/Kconfig"
-source "drivers/pci/hotplug/Kconfig"
 
 endmenu
 

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index af76634f8d9897fe61ae64a2b956d9ce07951c0c..a63c12259e77e03832c9d3c50da6ecbc9e62db18 100644 (file)
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -1233,8 +1233,6 @@ source "drivers/pci/Kconfig"
 
 source "drivers/pcmcia/Kconfig"
 
-source "drivers/pci/hotplug/Kconfig"
-
 endmenu
 
 menu "Executable file formats"

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 1bc4b5add65c49222d5a2d39400617e126efbac8..b534ebab36eac7397ca29119e1545fc9bbf7b611 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -576,8 +576,6 @@ config PCI_SYSCALL
 
 source "drivers/pci/Kconfig"
 
-source "drivers/pci/hotplug/Kconfig"
-
 source "drivers/pcmcia/Kconfig"
 
 endmenu

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 836ac5a963c83140d18dcd762459d19e1fd0c101..e1b12366481573098191e81b4dd088db51aa470f 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -386,8 +386,6 @@ config ISA
 
 source "drivers/pcmcia/Kconfig"
 
-source "drivers/pci/hotplug/Kconfig"
-
 endmenu
 
 

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index d21eec746afb9fdf1a305100ffcab8dd69f4d8d2..d16204d8b9266c0bd27b767246471d17a874dfab 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2935,8 +2935,6 @@ config ZONE_DMA32
 
 source "drivers/pcmcia/Kconfig"
 
-source "drivers/pci/hotplug/Kconfig"
-
 config RAPIDIO
        tristate "RapidIO support"
        depends on PCI

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 247a09f01608b3e3d7236f0d23b9f15b1a2e0a2f..e28f86ee41b85c2c8ad1a4de22381b8dcf194811 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -832,8 +832,6 @@ source "drivers/pci/Kconfig"
 
 source "drivers/pcmcia/Kconfig"
 
-source "drivers/pci/hotplug/Kconfig"
-
 config HAS_RAPIDIO
        bool
        default n

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 9918433420051565a242d5fa04e16241bfc19efa..e70d49837fb0060761b52e41d78a523608b66da6 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -605,7 +605,6 @@ config PCI_NR_MSI
          PCI devices.
 
 source "drivers/pci/Kconfig"
-source "drivers/pci/hotplug/Kconfig"
 
 endif  # PCI
 

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index ce52af9ca6ba2e9f4b508132316079a20031170a..17a4f1593d6564bcfb2f09e4c677f31931725516 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -851,8 +851,6 @@ source "drivers/pci/Kconfig"
 
 source "drivers/pcmcia/Kconfig"
 
-source "drivers/pci/hotplug/Kconfig"
-
 endmenu
 
 menu "Executable file formats"

diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 0c95266d102b90b734722a799a6d4e5dbcb02896..81719302b056e095dda4c5cfd15e8a5efa18a70f 100644 (file)
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -455,7 +455,6 @@ config TILE_PCI_IO
 
 source "drivers/pci/Kconfig"
 
-
 config TILE_USB
        tristate "Tilera USB host adapter support"
        default y
@@ -466,8 +465,6 @@ config TILE_USB
          Provides USB host adapter support for the built-in EHCI and OHCI
          interfaces on TILE-Gx chips.
 
-source "drivers/pci/hotplug/Kconfig"
-
 endmenu
 
 menu "Executable file formats"

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ff7fe2dc881cd01bbc1453be74b403bf13f0e2e1..1912637d6178e4aca45a8c386957c2b052786dc3 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2586,8 +2586,6 @@ config AMD_NB
 
 source "drivers/pcmcia/Kconfig"
 
-source "drivers/pci/hotplug/Kconfig"
-
 config RAPIDIO
        tristate "RapidIO support"
        depends on PCI

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index e9df1567d778e2f87ecdb1a64df1c2dfeb874071..7e9464b0fc00bb3de3267d3e707647f760c852c5 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -413,8 +413,6 @@ config FORCE_MAX_ZONEORDER
 
 source "drivers/pcmcia/Kconfig"
 
-source "drivers/pci/hotplug/Kconfig"
-
 config PLATFORM_WANT_DEFAULT_MEM
        def_bool n
 

diff --git a/drivers/parisc/Kconfig b/drivers/parisc/Kconfig
index 592de566e72ff5dbd806d5cd314eead262841822..3a102a84d637e7fecb7c8e81b8cb3c4d64d3cbfe 100644 (file)
--- a/drivers/parisc/Kconfig
+++ b/drivers/parisc/Kconfig
@@ -110,8 +110,6 @@ config IOMMU_HELPER
 
 source "drivers/pcmcia/Kconfig"
 
-source "drivers/pci/hotplug/Kconfig"
-
 endmenu
 
 menu "PA-RISC specific drivers"

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 04e00923d178ab17188c4c56259a765d79ba6418..616165d72a17f6fdf66f6a080e4f4b8d70bd66b5 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -121,4 +121,5 @@ config PCI_LABEL
        def_bool y if (DMI || ACPI)
        select NLS
 
+source "drivers/pci/hotplug/Kconfig"
 source "drivers/pci/host/Kconfig"