[PATCH 1/3] fedora: centralise PCI hotplug to generic

[Peter Robinson]

---
 fedora/configs/config-arm64             | 2 --
 fedora/configs/config-generic           | 2 ++
 fedora/configs/config-powerpc64-generic | 2 --
 fedora/configs/config-s390x             | 1 -
 fedora/configs/config-x86-generic       | 2 --
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/fedora/configs/config-arm64 b/fedora/configs/config-arm64
index 557b95e..6a3cfb9 100644
--- a/fedora/configs/config-arm64
+++ b/fedora/configs/config-arm64
@@ -121,8 +121,6 @@ CONFIG_EDAC_XGENE=m
 
 CONFIG_PCI_XGENE=y
 CONFIG_PCI_XGENE_MSI=y
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_CPCI is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set
 
 # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
diff --git a/fedora/configs/config-generic b/fedora/configs/config-generic
index e3e72e5..f24a44d 100644
--- a/fedora/configs/config-generic
+++ b/fedora/configs/config-generic
@@ -104,6 +104,8 @@ CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIE_ECRC=y
 CONFIG_PCIEAER_INJECT=m
+CONFIG_HOTPLUG_PCI=y
+# CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_PCIE=y
 
 # CONFIG_SGI_IOC4 is not set
diff --git a/fedora/configs/config-powerpc64-generic b/fedora/configs/config-powerpc64-generic
index 327b961..e3191a0 100644
--- a/fedora/configs/config-powerpc64-generic
+++ b/fedora/configs/config-powerpc64-generic
@@ -156,8 +156,6 @@ CONFIG_IO_EVENT_IRQ=y
 CONFIG_RTC_DRV_GENERIC=y
 # CONFIG_CMDLINE_BOOL is not set
 
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HOTPLUG_PCI_RPA=m
 CONFIG_HOTPLUG_PCI_RPA_DLPAR=y
diff --git a/fedora/configs/config-s390x b/fedora/configs/config-s390x
index ec43393..ae529e4 100644
--- a/fedora/configs/config-s390x
+++ b/fedora/configs/config-s390x
@@ -217,7 +217,6 @@ CONFIG_SCM_BLOCK_CLUSTER_WRITE=y
 CONFIG_PCI=y
 CONFIG_PCI_NR_FUNCTIONS=64
 CONFIG_PCI_NR_MSI=256
-CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_SHPC=y
 CONFIG_HOTPLUG_PCI_S390=y
diff --git a/fedora/configs/config-x86-generic b/fedora/configs/config-x86-generic
index 785d271..8628556 100644
--- a/fedora/configs/config-x86-generic
+++ b/fedora/configs/config-x86-generic
@@ -130,11 +130,9 @@ CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_BIOS=y
 
-CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
 
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
-- 
2.4.3