Merge tag 'sunxi-config64-for-5.2' of https://git.kernel.org/pub/scm/linux/kernel...

Allwinner arm64 defconfig changes for 5.2

Just a single patch to enable our SPI controller on the arm64 defconfig.

* tag 'sunxi-config64-for-5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: defconfig: Enable SPI_SUN6I

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm64/configs/defconfig
index 755553f9c75360f06c245910b8c3114006fa7406,3b6af01d1f42c1111f07815d1448ca03fe620db9..21128287be8bff998deb633b28c69cb7ff6c8e9a
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -366,6 -372,8 +366,7 @@@ CONFIG_SPI_ROCKCHIP=
  CONFIG_SPI_QUP=y
  CONFIG_SPI_S3C64XX=y
  CONFIG_SPI_SPIDEV=m
 -CONFIG_SPI_NXP_FLEXSPI=y
+ CONFIG_SPI_SUN6I=y
  CONFIG_SPMI=y
  CONFIG_PINCTRL_SINGLE=y
  CONFIG_PINCTRL_MAX77620=y