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

Pull "Allwinner arm64 defconfig changes for 4.14" from Chen-Yu Tsai:

Enable X-Powers AXP series PMIC mfd and regulator support by default.

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

diff --cc arch/arm64/configs/defconfig
index e85d2bda8ef0fb0c8fe7e57db84fbb4aec65ed36,a0c42b835af604e9d2db57d361fc7c9a3085dc81..a3176b56e8fdbaab8624a785687d2a06020fbbd9
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -320,8 -311,8 +320,9 @@@ CONFIG_S3C2410_WATCHDOG=
  CONFIG_MESON_GXBB_WATCHDOG=m
  CONFIG_MESON_WATCHDOG=m
  CONFIG_RENESAS_WDT=y
 +CONFIG_UNIPHIER_WATCHDOG=y
  CONFIG_BCM2835_WDT=y
+ CONFIG_MFD_AXP20X_RSB=y
  CONFIG_MFD_CROS_EC=y
  CONFIG_MFD_CROS_EC_I2C=y
  CONFIG_MFD_CROS_EC_SPI=y