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 'secureexec-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[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 e74de69caeabb675908cb1672c8843cc939fd8d9..1736813bdea76aec36ac7701dc3458d1cba627d2 100644
(file)
--- a/
arch/arm/configs/imx_v6_v7_defconfig
+++ b/
arch/arm/configs/imx_v6_v7_defconfig
@@
-226,7
+226,7
@@
CONFIG_REGULATOR_MC13892=y
CONFIG_REGULATOR_PFUZE100=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_
MEDIA_RC_SUPPORT
=y
+CONFIG_
RC_CORE
=y
CONFIG_RC_DEVICES=y
CONFIG_IR_GPIO_CIR=y
CONFIG_MEDIA_USB_SUPPORT=y