Skip to content

Commit 6efb9f7

Browse files
committed
Merge tag 'socfpga_fix_for_v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes
SoCFPGA fix for v5.17, part 1 - Fix a build error for socfpga_defconfig * tag 'socfpga_fix_for_v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: ARM: socfpga: fix missing RESET_CONTROLLER Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents d9058d6 + 3037b17 commit 6efb9f7

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

arch/arm/mach-socfpga/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
menuconfig ARCH_INTEL_SOCFPGA
33
bool "Altera SOCFPGA family"
44
depends on ARCH_MULTI_V7
5+
select ARCH_HAS_RESET_CONTROLLER
56
select ARCH_SUPPORTS_BIG_ENDIAN
67
select ARM_AMBA
78
select ARM_GIC
@@ -18,6 +19,7 @@ menuconfig ARCH_INTEL_SOCFPGA
1819
select PL310_ERRATA_727915
1920
select PL310_ERRATA_753970 if PL310
2021
select PL310_ERRATA_769419
22+
select RESET_CONTROLLER
2123

2224
if ARCH_INTEL_SOCFPGA
2325
config SOCFPGA_SUSPEND

0 commit comments

Comments
 (0)