diff options
| author | Rob Herring <robh@kernel.org> | 2015-10-22 09:22:09 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2015-10-22 09:22:09 -0500 |
| commit | f92ce7618f0cb0ced87ea1cfe994d2e8473c61b4 (patch) | |
| tree | 8589e85799e0de7b1cdf0b4e8f08397eeeb72a74 /arch/arm/configs/omap2plus_defconfig | |
| parent | 307751ee3212df0d047b0e1a93ce21f2e511d1a1 (diff) | |
| parent | eb3fcf007fffe5830d815e713591f3e858f2a365 (diff) | |
Merge branch 'dt-doc-cleanup' into for-next
Diffstat (limited to 'arch/arm/configs/omap2plus_defconfig')
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 50c84e1876fc..3f15a5cae167 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -240,7 +240,8 @@ CONFIG_SSI_PROTOCOL=m CONFIG_PINCTRL_SINGLE=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_PCF857X=m +CONFIG_GPIO_PCA953X=m +CONFIG_GPIO_PCF857X=y CONFIG_GPIO_TWL4030=y CONFIG_GPIO_PALMAS=y CONFIG_W1=m @@ -350,6 +351,8 @@ CONFIG_USB_MUSB_HDRC=m CONFIG_USB_MUSB_OMAP2PLUS=m CONFIG_USB_MUSB_AM35X=m CONFIG_USB_MUSB_DSPS=m +CONFIG_USB_INVENTRA_DMA=y +CONFIG_USB_TI_CPPI41_DMA=y CONFIG_USB_DWC3=m CONFIG_USB_TEST=m CONFIG_AM335X_PHY_USB=y |