Commit 5f8fc432 authored by Bogicevic Sasa's avatar Bogicevic Sasa Committed by Bjorn Helgaas
Browse files

PCI: Include pci/pcie/Kconfig directly from pci/Kconfig



Include pci/pcie/Kconfig directly from pci/Kconfig, so arches don't
have to source both pci/Kconfig and pci/pcie/Kconfig.

Note that this effectively adds pci/pcie/Kconfig to the following
arches, because they already sourced drivers/pci/Kconfig but they
previously did not source drivers/pci/pcie/Kconfig:

  alpha
  avr32
  blackfin
  frv
  m32r
  m68k
  microblaze
  mn10300
  parisc
  sparc
  unicore32
  xtensa

[bhelgaas: changelog, source pci/pcie/Kconfig at top of pci/Kconfig, whitespace]
Signed-off-by: default avatarSasa Bogicevic <brutallesale@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 92e963f5
...@@ -1212,7 +1212,6 @@ config PCI_HOST_ITE8152 ...@@ -1212,7 +1212,6 @@ config PCI_HOST_ITE8152
select DMABOUNCE select DMABOUNCE
source "drivers/pci/Kconfig" source "drivers/pci/Kconfig"
source "drivers/pci/pcie/Kconfig"
source "drivers/pcmcia/Kconfig" source "drivers/pcmcia/Kconfig"
......
...@@ -235,7 +235,6 @@ config PCI_SYSCALL ...@@ -235,7 +235,6 @@ config PCI_SYSCALL
def_bool PCI def_bool PCI
source "drivers/pci/Kconfig" source "drivers/pci/Kconfig"
source "drivers/pci/pcie/Kconfig"
source "drivers/pci/hotplug/Kconfig" source "drivers/pci/hotplug/Kconfig"
endmenu endmenu
......
...@@ -574,8 +574,6 @@ config PCI_DOMAINS ...@@ -574,8 +574,6 @@ config PCI_DOMAINS
config PCI_SYSCALL config PCI_SYSCALL
def_bool PCI def_bool PCI
source "drivers/pci/pcie/Kconfig"
source "drivers/pci/Kconfig" source "drivers/pci/Kconfig"
source "drivers/pci/hotplug/Kconfig" source "drivers/pci/hotplug/Kconfig"
......
...@@ -2876,8 +2876,6 @@ config PCI_DOMAINS ...@@ -2876,8 +2876,6 @@ config PCI_DOMAINS
source "drivers/pci/Kconfig" source "drivers/pci/Kconfig"
source "drivers/pci/pcie/Kconfig"
# #
# ISA support is now enabled via select. Too many systems still have the one # ISA support is now enabled via select. Too many systems still have the one
# or other ISA chip on the board that users don't know about so don't expect # or other ISA chip on the board that users don't know about so don't expect
......
...@@ -828,8 +828,6 @@ config PCI_8260 ...@@ -828,8 +828,6 @@ config PCI_8260
select PPC_INDIRECT_PCI select PPC_INDIRECT_PCI
default y default y
source "drivers/pci/pcie/Kconfig"
source "drivers/pci/Kconfig" source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig" source "drivers/pcmcia/Kconfig"
......
...@@ -605,7 +605,6 @@ config PCI_NR_MSI ...@@ -605,7 +605,6 @@ config PCI_NR_MSI
PCI devices. PCI devices.
source "drivers/pci/Kconfig" source "drivers/pci/Kconfig"
source "drivers/pci/pcie/Kconfig"
source "drivers/pci/hotplug/Kconfig" source "drivers/pci/hotplug/Kconfig"
endif # PCI endif # PCI
......
...@@ -847,8 +847,6 @@ config PCI ...@@ -847,8 +847,6 @@ config PCI
config PCI_DOMAINS config PCI_DOMAINS
bool bool
source "drivers/pci/pcie/Kconfig"
source "drivers/pci/Kconfig" source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig" source "drivers/pcmcia/Kconfig"
......
...@@ -455,7 +455,6 @@ config TILE_PCI_IO ...@@ -455,7 +455,6 @@ config TILE_PCI_IO
source "drivers/pci/Kconfig" source "drivers/pci/Kconfig"
source "drivers/pci/pcie/Kconfig"
config TILE_USB config TILE_USB
tristate "Tilera USB host adapter support" tristate "Tilera USB host adapter support"
......
...@@ -2431,8 +2431,6 @@ config PCI_CNB20LE_QUIRK ...@@ -2431,8 +2431,6 @@ config PCI_CNB20LE_QUIRK
You should say N unless you know you need this. You should say N unless you know you need this.
source "drivers/pci/pcie/Kconfig"
source "drivers/pci/Kconfig" source "drivers/pci/Kconfig"
# x86_64 have no ISA slots, but can have ISA-style DMA. # x86_64 have no ISA slots, but can have ISA-style DMA.
......
# #
# PCI configuration # PCI configuration
# #
source "drivers/pci/pcie/Kconfig"
config PCI_BUS_ADDR_T_64BIT config PCI_BUS_ADDR_T_64BIT
def_bool y if (ARCH_DMA_ADDR_T_64BIT || 64BIT) def_bool y if (ARCH_DMA_ADDR_T_64BIT || 64BIT)
depends on PCI depends on PCI
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment