diff options
author | Tony Lindgren <tony@atomide.com> | 2015-09-14 23:42:11 +0300 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2015-09-14 23:42:11 +0300 |
commit | 7168e947291f0ead07e5638b4599fb7845288b69 (patch) | |
tree | b39cdf02f6d2282eeb91696d4a1c7ddb6afb0e38 /arch/arm/configs/omap2plus_defconfig | |
parent | 21b430d23d233c67e6589ea5054d18392e15a28e (diff) | |
parent | 60fdcb8863d9b4a8b6c6b367886fadb50d4c0b07 (diff) | |
download | linux-7168e947291f0ead07e5638b4599fb7845288b69.tar.xz |
Merge branch 'fixes-rc1' into omap-for-v4.3/fixes
Diffstat (limited to 'arch/arm/configs/omap2plus_defconfig')
-rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 7b35e70d4bb3..ffc8fa2565f9 100644 --- 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 |