From: Olof Johansson Date: Mon, 29 Apr 2019 17:00:21 +0000 (-0700) Subject: Merge tag 'v5.2-rockchip-defconfig32-1' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=85200317b324924be3bc72b7bfcce219020ced9c;p=linux.git Merge tag 'v5.2-rockchip-defconfig32-1' of git://git./linux/kernel/git/mmind/linux-rockchip into arm/defconfig 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 --- 85200317b324924be3bc72b7bfcce219020ced9c diff --cc arch/arm/configs/multi_v7_defconfig index 1aab5350212e5,d160ac4bad219..cc60a6506319d --- a/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