summary refs log tree commit diff
path: root/arch/s390
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-03-08 14:57:21 -0600
committerBjorn Helgaas <bhelgaas@google.com>2016-03-08 15:10:48 -0600
commite7e127e3c767094aca96ee976729dc5f756666df (patch)
tree3e331a4897b3181dc43985cc0aee19911a66e1c5 /arch/s390
parent5f8fc43217a01c98be88aa53794b4d1333a07a5a (diff)
downloadlinux-e7e127e3c767094aca96ee976729dc5f756666df.tar.gz
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/s390')
-rw-r--r--arch/s390/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 991843342005..e70d49837fb0 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