summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-11-15 20:05:33 +0100
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-11-23 03:45:44 +0100
commit2eac9c2dfb2b9660d592abbf3d172ebcb0af3719 (patch)
tree456fa735e8052a6f2c629c1a832107f36bad017d /arch/mips
parentPCI: consolidate PCI config entry in drivers/pci (diff)
downloadlinux-2eac9c2dfb2b9660d592abbf3d172ebcb0af3719.tar.xz
linux-2eac9c2dfb2b9660d592abbf3d172ebcb0af3719.zip
PCI: consolidate the PCI_DOMAINS and PCI_DOMAINS_GENERIC config options
Move the definitions to drivers/pci and let the architectures select them. Two small differences to before: PCI_DOMAINS_GENERIC now selects PCI_DOMAINS, cutting down the churn for modern architectures. As the only architectured arm did previously also offer PCI_DOMAINS as a user visible choice in addition to selecting it from the relevant configs, this is gone now. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Paul Burton <paul.burton@mips.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/Kconfig10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 01be35aeffad..151a4aaf0610 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -73,7 +73,6 @@ config MIPS
select IRQ_FORCED_THREADING
select MODULES_USE_ELF_RELA if MODULES && 64BIT
select MODULES_USE_ELF_REL if MODULES
- select PCI_DOMAINS if PCI
select PERF_USE_VMALLOC
select RTC_LIB
select SYSCTL_EXCEPTION_TRACE
@@ -3028,19 +3027,14 @@ menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
config HW_HAS_EISA
bool
-config PCI_DOMAINS
- bool
-
-config PCI_DOMAINS_GENERIC
- bool
-
config PCI_DRIVERS_GENERIC
- select PCI_DOMAINS_GENERIC if PCI_DOMAINS
+ select PCI_DOMAINS_GENERIC if PCI
bool
config PCI_DRIVERS_LEGACY
def_bool !PCI_DRIVERS_GENERIC
select NO_GENERIC_PCI_IOPORT_MAP
+ select PCI_DOMAINS if PCI
#
# ISA support is now enabled via select. Too many systems still have the one