summaryrefslogtreecommitdiffstats
path: root/arch/ia64
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/ia64
parenteb01d42a77785ff96b6e66a2a2e7027fc6d78e4a (diff)
downloadlinux-2eac9c2dfb2b9660d592abbf3d172ebcb0af3719.tar.bz2
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/ia64')
-rw-r--r--arch/ia64/Kconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 4dec7457feed..7cf4b8bd779f 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -15,6 +15,7 @@ config IA64
select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
select FORCE_PCI if (!IA64_HP_SIM)
+ select PCI_DOMAINS if PCI
select HAVE_UNSTABLE_SCHED_CLOCK
select HAVE_EXIT_THREAD
select HAVE_IDE
@@ -544,9 +545,6 @@ if !IA64_HP_SIM
menu "Bus options (PCI, PCMCIA)"
-config PCI_DOMAINS
- def_bool PCI
-
config PCI_SYSCALL
def_bool PCI