diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-03-08 14:57:21 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-03-08 15:10:48 -0600 |
| commit | e7e127e3c767094aca96ee976729dc5f756666df (patch) | |
| tree | 3e331a4897b3181dc43985cc0aee19911a66e1c5 /drivers | |
| parent | 5f8fc43217a01c98be88aa53794b4d1333a07a5a (diff) | |
| download | talos-obmc-linux-e7e127e3c767094aca96ee976729dc5f756666df.tar.gz talos-obmc-linux-e7e127e3c767094aca96ee976729dc5f756666df.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/parisc/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/pci/Kconfig | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/parisc/Kconfig b/drivers/parisc/Kconfig index 592de566e72f..3a102a84d637 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 04e00923d178..616165d72a17 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" |
