summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-03-08 21:57:21 +0100
committerBjorn Helgaas <bhelgaas@google.com>2016-03-08 22:10:48 +0100
commite7e127e3c767094aca96ee976729dc5f756666df (patch)
tree3e331a4897b3181dc43985cc0aee19911a66e1c5 /arch/x86/Kconfig
parentPCI: Include pci/pcie/Kconfig directly from pci/Kconfig (diff)
downloadlinux-e7e127e3c767094aca96ee976729dc5f756666df.tar.xz
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 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ff7fe2dc881c..1912637d6178 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