Merge tag 'v5.2-rockchip-defconfig32-1' of git://git.kernel.org/pub/scm/linux/kernel...

Enable more options needed by Veyron Chromebooks.

* tag 'v5.2-rockchip-defconfig32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: multi_v7_defconfig: Enable missing drivers for supported Chromebooks

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

diff --cc arch/arm/configs/multi_v7_defconfig
index 1aab5350212e56b3b7142d8ee585705c5a07de9e,d160ac4bad219b3d7d610fc6736cafbbc2cce1ab..cc60a6506319dd4f36fd4105467832441a865796
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -1000,7 -987,9 +1010,8 @@@ CONFIG_PHY_DM816X_USB=
  CONFIG_OMAP_USB2=y
  CONFIG_TI_PIPE3=y
  CONFIG_TWL4030_USB=m
 +CONFIG_MESON_MX_EFUSE=m
+ CONFIG_ROCKCHIP_EFUSE=m
  CONFIG_NVMEM_IMX_OCOTP=y
  CONFIG_NVMEM_SUNXI_SID=y
  CONFIG_NVMEM_VF610_OCOTP=y