diff options
-rw-r--r-- | arch/arm/configs/android_imx5_defconfig | 4 | ||||
-rw-r--r-- | arch/arm/configs/android_omap3_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/android_omap4_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/android_origen_defconfig | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/configs/android_imx5_defconfig b/arch/arm/configs/android_imx5_defconfig index dca428c2899..333b7118349 100644 --- a/arch/arm/configs/android_imx5_defconfig +++ b/arch/arm/configs/android_imx5_defconfig @@ -56,7 +56,7 @@ CONFIG_VFP=y CONFIG_NEON=y CONFIG_BINFMT_MISC=m CONFIG_WAKELOCK=y -# CONFIG_EARLYSUSPEND is not set +CONFIG_FB_EARLYSUSPEND=y CONFIG_PM_RUNTIME=y CONFIG_PM_DEBUG=y CONFIG_NET=y @@ -189,7 +189,7 @@ CONFIG_USB_SUSPEND=y CONFIG_USB_OTG=y # CONFIG_USB_OTG_WHITELIST is not set CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_MXC=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_ETH=m diff --git a/arch/arm/configs/android_omap3_defconfig b/arch/arm/configs/android_omap3_defconfig index 46dc03a2471..71223a5df7d 100644 --- a/arch/arm/configs/android_omap3_defconfig +++ b/arch/arm/configs/android_omap3_defconfig @@ -37,7 +37,6 @@ CONFIG_CPU_IDLE=y CONFIG_FPE_NWFPE=y CONFIG_BINFMT_MISC=y CONFIG_WAKELOCK=y -# CONFIG_EARLYSUSPEND is not set CONFIG_PM_DEBUG=y CONFIG_NET=y CONFIG_PACKET=y diff --git a/arch/arm/configs/android_omap4_defconfig b/arch/arm/configs/android_omap4_defconfig index b303895a256..1d2976cceca 100644 --- a/arch/arm/configs/android_omap4_defconfig +++ b/arch/arm/configs/android_omap4_defconfig @@ -36,7 +36,6 @@ CONFIG_CPU_IDLE=y CONFIG_FPE_NWFPE=y CONFIG_BINFMT_MISC=y CONFIG_WAKELOCK=y -# CONFIG_EARLYSUSPEND is not set CONFIG_PM_DEBUG=y CONFIG_NET=y CONFIG_PACKET=y diff --git a/arch/arm/configs/android_origen_defconfig b/arch/arm/configs/android_origen_defconfig index 07161940e70..244343ffffb 100644 --- a/arch/arm/configs/android_origen_defconfig +++ b/arch/arm/configs/android_origen_defconfig @@ -45,7 +45,7 @@ CONFIG_VFP=y CONFIG_NEON=y CONFIG_BINFMT_MISC=y CONFIG_WAKELOCK=y -# CONFIG_EARLYSUSPEND is not set +CONFIG_FB_EARLYSUSPEND=y CONFIG_PM_RUNTIME=y CONFIG_PM_DEBUG=y CONFIG_NET=y |