git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nand/for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
imx_v6_v7_defconfig
diff --git
a/arch/arm/configs/imx_v6_v7_defconfig
b/arch/arm/configs/imx_v6_v7_defconfig
index 07b796c2f0ee2c7f47e4438fe473ca18c440c153..8116648a8efd0240233f1df173e3a5cf51a24b8d 100644
(file)
--- a/
arch/arm/configs/imx_v6_v7_defconfig
+++ b/
arch/arm/configs/imx_v6_v7_defconfig
@@
-398,7
+398,7
@@
CONFIG_MAG3110=y
CONFIG_MPL3115=y
CONFIG_PWM=y
CONFIG_PWM_FSL_FTM=y
-CONFIG_PWM_IMX=y
+CONFIG_PWM_IMX
27
=y
CONFIG_NVMEM_IMX_OCOTP=y
CONFIG_NVMEM_VF610_OCOTP=y
CONFIG_TEE=y