Unverified Commit 6efb9f73 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'socfpga_fix_for_v5.17' of... 

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/20220207101002.7566-1-dinguyen@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d9058d6a 3037b174

arch/arm/mach-socfpga/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
menuconfig ARCH_INTEL_SOCFPGA

	bool "Altera SOCFPGA family"

	depends on ARCH_MULTI_V7

	select ARCH_HAS_RESET_CONTROLLER

	select ARCH_SUPPORTS_BIG_ENDIAN

	select ARM_AMBA

	select ARM_GIC
@@ -18,6 +19,7 @@ menuconfig ARCH_INTEL_SOCFPGA 
	select PL310_ERRATA_727915

	select PL310_ERRATA_753970 if PL310

	select PL310_ERRATA_769419

	select RESET_CONTROLLER



if ARCH_INTEL_SOCFPGA

config SOCFPGA_SUSPEND