diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-07-17 10:27:43 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-07-17 10:27:43 +0300 |
commit | 52b544bd386688177c41d53e748111c29d0ccc98 (patch) | |
tree | c2083582176e773084364af93cc44e0f94b6cde8 /arch/arm/mach-socfpga/Kconfig | |
parent | afed7bcf9487bb28e2e2b016a195085c07416c0b (diff) | |
parent | 9d3cce1e8b8561fed5f383d22a4d6949db4eadbe (diff) | |
download | linux-52b544bd386688177c41d53e748111c29d0ccc98.tar.xz |
Merge tag 'v4.18-rc5' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-socfpga/Kconfig')
-rw-r--r-- | arch/arm/mach-socfpga/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig index d0f62eacf59d..4adb901dd5eb 100644 --- a/arch/arm/mach-socfpga/Kconfig +++ b/arch/arm/mach-socfpga/Kconfig @@ -10,6 +10,7 @@ menuconfig ARCH_SOCFPGA select HAVE_ARM_SCU select HAVE_ARM_TWD if SMP select MFD_SYSCON + select PCI_DOMAINS if PCI if ARCH_SOCFPGA config SOCFPGA_SUSPEND |