summaryrefslogtreecommitdiffstats
path: root/arch/s390
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 11:45:44 +0900
commit2eac9c2dfb2b9660d592abbf3d172ebcb0af3719 (patch)
tree456fa735e8052a6f2c629c1a832107f36bad017d /arch/s390
parenteb01d42a77785ff96b6e66a2a2e7027fc6d78e4a (diff)
downloadblackbird-obmc-linux-2eac9c2dfb2b9660d592abbf3d172ebcb0af3719.tar.gz
blackbird-obmc-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/s390')
-rw-r--r--arch/s390/Kconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 9f05625d75b9..22a0c364b31d 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -181,6 +181,7 @@ config S390
select NEED_SG_DMA_LENGTH if PCI
select OLD_SIGACTION
select OLD_SIGSUSPEND3
+ select PCI_DOMAINS if PCI
select PCI_MSI if PCI
select SPARSE_IRQ
select SYSCTL_EXCEPTION_TRACE
@@ -724,9 +725,6 @@ config PCI_NR_FUNCTIONS
endif # PCI
-config PCI_DOMAINS
- def_bool PCI
-
config HAS_IOMEM
def_bool PCI
OpenPOWER on IntegriCloud