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>
This commit is contained in:
Родитель
5f8fc43217
Коммит
e7e127e3c7
|
@ -235,7 +235,6 @@ config PCI_SYSCALL
|
|||
def_bool PCI
|
||||
|
||||
source "drivers/pci/Kconfig"
|
||||
source "drivers/pci/hotplug/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
||||
|
|
|
@ -1233,8 +1233,6 @@ source "drivers/pci/Kconfig"
|
|||
|
||||
source "drivers/pcmcia/Kconfig"
|
||||
|
||||
source "drivers/pci/hotplug/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
||||
menu "Executable file formats"
|
||||
|
|
|
@ -576,8 +576,6 @@ config PCI_SYSCALL
|
|||
|
||||
source "drivers/pci/Kconfig"
|
||||
|
||||
source "drivers/pci/hotplug/Kconfig"
|
||||
|
||||
source "drivers/pcmcia/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
|
|
@ -386,8 +386,6 @@ config ISA
|
|||
|
||||
source "drivers/pcmcia/Kconfig"
|
||||
|
||||
source "drivers/pci/hotplug/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
||||
|
||||
|
|
|
@ -2935,8 +2935,6 @@ config ZONE_DMA32
|
|||
|
||||
source "drivers/pcmcia/Kconfig"
|
||||
|
||||
source "drivers/pci/hotplug/Kconfig"
|
||||
|
||||
config RAPIDIO
|
||||
tristate "RapidIO support"
|
||||
depends on PCI
|
||||
|
|
|
@ -832,8 +832,6 @@ source "drivers/pci/Kconfig"
|
|||
|
||||
source "drivers/pcmcia/Kconfig"
|
||||
|
||||
source "drivers/pci/hotplug/Kconfig"
|
||||
|
||||
config HAS_RAPIDIO
|
||||
bool
|
||||
default n
|
||||
|
|
|
@ -605,7 +605,6 @@ config PCI_NR_MSI
|
|||
PCI devices.
|
||||
|
||||
source "drivers/pci/Kconfig"
|
||||
source "drivers/pci/hotplug/Kconfig"
|
||||
|
||||
endif # PCI
|
||||
|
||||
|
|
|
@ -851,8 +851,6 @@ source "drivers/pci/Kconfig"
|
|||
|
||||
source "drivers/pcmcia/Kconfig"
|
||||
|
||||
source "drivers/pci/hotplug/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
||||
menu "Executable file formats"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -2586,8 +2586,6 @@ config AMD_NB
|
|||
|
||||
source "drivers/pcmcia/Kconfig"
|
||||
|
||||
source "drivers/pci/hotplug/Kconfig"
|
||||
|
||||
config RAPIDIO
|
||||
tristate "RapidIO support"
|
||||
depends on PCI
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -110,8 +110,6 @@ config IOMMU_HELPER
|
|||
|
||||
source "drivers/pcmcia/Kconfig"
|
||||
|
||||
source "drivers/pci/hotplug/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
||||
menu "PA-RISC specific drivers"
|
||||
|
|
|
@ -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"
|
||||
|
|
Загрузка…
Ссылка в новой задаче