Merge tag 'arm64_defconfig_for_v5.18' of git://git.kernel.org/pub/scm/linux/kernel...

ARM64 defconfig for v5.18
- Enable the Altera FPGA Manager CVP driver

* tag 'arm64_defconfig_for_v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  arm64: defconfig: enable the CVP driver

Link: https://lore.kernel.org/r/20220310195740.151250-2-dinguyen@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm64/configs/defconfig
index e5700421603bd37e21d1db54b6c670872f1c73e6,b2efafb15de6676a3a1c5d4d51eccb30c007b946..0a2fe757c45456e26734006b3ee3c310fb24ceea
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -1193,8 -1171,8 +1193,9 @@@ CONFIG_NVMEM_SUNXI_SID=
  CONFIG_UNIPHIER_EFUSE=y
  CONFIG_MESON_EFUSE=m
  CONFIG_NVMEM_RMEM=m
 +CONFIG_NVMEM_LAYERSCAPE_SFP=m
  CONFIG_FPGA=y
+ CONFIG_FPGA_MGR_ALTERA_CVP=m
  CONFIG_FPGA_MGR_STRATIX10_SOC=m
  CONFIG_FPGA_BRIDGE=m
  CONFIG_ALTERA_FREEZE_BRIDGE=m