On Tue, Mar 08, 2016 at 03:27:15PM -0600, Bjorn Helgaas wrote: > 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@xxxxxxxxx> > Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> I applied this to pci/kconfig for v4.6. > --- > arch/arm64/Kconfig | 1 - > arch/blackfin/Kconfig | 2 -- > arch/ia64/Kconfig | 2 -- > arch/m32r/Kconfig | 2 -- > arch/mips/Kconfig | 2 -- > arch/powerpc/Kconfig | 2 -- > arch/s390/Kconfig | 1 - > arch/sh/Kconfig | 2 -- > arch/tile/Kconfig | 3 --- > arch/x86/Kconfig | 2 -- > arch/xtensa/Kconfig | 2 -- > drivers/parisc/Kconfig | 2 -- > drivers/pci/Kconfig | 1 + > 13 files changed, 1 insertion(+), 23 deletions(-) > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index 128ec3c..fc8089d 100644 > --- 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 af76634..a63c122 100644 > --- 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 1bc4b5a..b534eba 100644 > --- 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 836ac5a..e1b1236 100644 > --- 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 d21eec7..d16204d 100644 > --- 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 247a09f..e28f86e 100644 > --- 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 9918433..e70d498 100644 > --- 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 ce52af9..17a4f15 100644 > --- 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 0c95266..8171930 100644 > --- 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 ff7fe2d..1912637 100644 > --- 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 e9df156..7e9464b 100644 > --- 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 592de56..3a102a8 100644 > --- 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 04e0092..616165d 100644 > --- 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" > > -- > To unsubscribe from this list: send the line "unsubscribe linux-arch" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
