]> git.ipfire.org Git - people/ms/linux.git/commitdiff
Merge tag 'socfpga_fix_for_v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Tue, 8 Feb 2022 08:57:07 +0000 (09:57 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 8 Feb 2022 08:57:07 +0000 (09:57 +0100)
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: Arnd Bergmann <arnd@arndb.de>

Trivial merge