projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fixes-rc1' into omap-for-v4.3/fixes
[linux-2.6-block.git]
/
arch
/
arm
/
configs
/
omap2plus_defconfig
diff --git
a/arch/arm/configs/omap2plus_defconfig
b/arch/arm/configs/omap2plus_defconfig
index 7b35e70d4bb371fd337cf426a36392c54ac7303f..ffc8fa2565f966538b18e91e96db32aa49110596 100644
(file)
--- a/
arch/arm/configs/omap2plus_defconfig
+++ b/
arch/arm/configs/omap2plus_defconfig
@@
-240,7
+240,7
@@
CONFIG_SSI_PROTOCOL=m
CONFIG_PINCTRL_SINGLE=y
CONFIG_DEBUG_GPIO=y
CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_PCF857X=
m
+CONFIG_GPIO_PCF857X=
y
CONFIG_GPIO_TWL4030=y
CONFIG_GPIO_PALMAS=y
CONFIG_W1=m