summaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
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/arm/Kconfig
parenteb01d42a77785ff96b6e66a2a2e7027fc6d78e4a (diff)
downloadlwn-2eac9c2dfb2b9660d592abbf3d172ebcb0af3719.tar.gz
lwn-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/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig15
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 50bc67857432..96e0d75dc05b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -331,7 +331,7 @@ config ARCH_MULTIPLATFORM
select GENERIC_CLOCKEVENTS
select GENERIC_IRQ_MULTI_HANDLER
select HAVE_PCI
- select PCI_DOMAINS if PCI
+ select PCI_DOMAINS_GENERIC if PCI
select SPARSE_IRQ
select USE_OF
@@ -1227,19 +1227,6 @@ config ISA_DMA
config ISA_DMA_API
bool
-config PCI_DOMAINS
- bool "Support for multiple PCI domains"
- depends on PCI
- help
- Enable PCI domains kernel management. Say Y if your machine
- has a PCI bus hierarchy that requires more than one PCI
- domain (aka segment) to be correctly managed. Say N otherwise.
-
- If you don't know what to do here, say N.
-
-config PCI_DOMAINS_GENERIC
- def_bool PCI_DOMAINS
-
config PCI_NANOENGINE
bool "BSE nanoEngine PCI support"
depends on SA1100_NANOENGINE