diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-11-30 11:59:33 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-11-30 11:59:33 +0800 |
| commit | 08c473f52af7434b09214fedcfce222fb9821033 (patch) | |
| tree | 555dc016292a132bd55096d42c945c61c6394174 /arch/arm/configs/imx6_android_defconfig | |
| parent | 9ae3b66a8ea648d977cbcebf02209f21cc9be3a4 (diff) | |
| parent | 57ade285e32285186879f96c346dd5b45a7f0dd6 (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_1.1.0' into imx_3.0.35_android
Conflicts:
arch/arm/mach-mx6/board-mx6q_sabrelite.c
arch/arm/mach-mx6/board-mx6q_sabresd.c
arch/arm/plat-mxc/cpufreq.c
Diffstat (limited to 'arch/arm/configs/imx6_android_defconfig')
| -rw-r--r-- | arch/arm/configs/imx6_android_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/imx6_android_defconfig b/arch/arm/configs/imx6_android_defconfig index 5f8803d2bba9..0d0e0a3ac67a 100644 --- a/arch/arm/configs/imx6_android_defconfig +++ b/arch/arm/configs/imx6_android_defconfig @@ -338,6 +338,7 @@ CONFIG_MACH_MX6Q_SABREAUTO=y # # CONFIG_IMX_PCIE is not set CONFIG_USB_EHCI_ARC_H1=y +CONFIG_USB_FSL_ARC_OTG=y # CONFIG_MX6_INTER_LDO_BYPASS is not set CONFIG_MX6_CLK_FOR_BOOTUI_TRANS=y CONFIG_ISP1504_MXC=y @@ -1388,6 +1389,7 @@ CONFIG_TOUCHSCREEN_MAX11801=y # CONFIG_TOUCHSCREEN_TOUCHWIN is not set # CONFIG_TOUCHSCREEN_WM97XX is not set # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_TOUCHSCREEN_NOVATEK is not set # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set # CONFIG_TOUCHSCREEN_TSC2005 is not set # CONFIG_TOUCHSCREEN_TSC2007 is not set |