projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arm-soc/for-5.12/defconfig' of https://github.com/Broadcom/stblinux into...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
configs
/
multi_v7_defconfig
diff --git
a/arch/arm/configs/multi_v7_defconfig
b/arch/arm/configs/multi_v7_defconfig
index
c12b28c
..
ec1d9f0
100644
(file)
--- a/
arch/arm/configs/multi_v7_defconfig
+++ b/
arch/arm/configs/multi_v7_defconfig
@@
-1118,6
+1118,7
@@
CONFIG_ROCKCHIP_EFUSE=m
CONFIG_NVMEM_SUNXI_SID=y
CONFIG_NVMEM_VF610_OCOTP=y
CONFIG_MESON_MX_EFUSE=m
+CONFIG_NVMEM_RMEM=m
CONFIG_FSI=m
CONFIG_FSI_MASTER_GPIO=m
CONFIG_FSI_MASTER_HUB=m