summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2011-11-30 10:28:38 +0800
committerAndy Green <andy.green@linaro.org>2011-11-30 10:28:38 +0800
commitff3848261d2d7cb447c5f77f01757133060f3004 (patch)
tree14ff70def794d058880d09927deba75844858509
parent5a4df1cc3d706fe0a5a1aec45052eb0bfa922ec4 (diff)
config disable SDIO_UART
Signed-off-by: Andy Green <andy.green@linaro.org>
-rw-r--r--arch/arm/configs/android_omap4_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/configs/android_omap4_defconfig b/arch/arm/configs/android_omap4_defconfig
index f821163f200..6f7c2932c21 100644
--- a/arch/arm/configs/android_omap4_defconfig
+++ b/arch/arm/configs/android_omap4_defconfig
@@ -33,7 +33,6 @@ CONFIG_OMAP_SMARTREFLEX=y
CONFIG_OMAP_SMARTREFLEX_CLASS3=y
CONFIG_OMAP_MUX_DEBUG=y
CONFIG_OMAP_TEMP_SENSOR=y
-CONFIG_OMAP_MBOX_FWK=y
# CONFIG_ARCH_OMAP2 is not set
# CONFIG_MACH_OMAP3_BEAGLE is not set
# CONFIG_MACH_DEVKIT8000 is not set
@@ -75,6 +74,7 @@ CONFIG_CPU_IDLE=y
CONFIG_FPE_NWFPE=y
CONFIG_BINFMT_MISC=y
CONFIG_WAKELOCK=y
+CONFIG_FB_EARLYSUSPEND=y
CONFIG_PM_DEBUG=y
CONFIG_SUSPEND_TIME=y
CONFIG_NET=y
@@ -301,7 +301,6 @@ CONFIG_USB_GADGET_MUSB_HDRC=m
CONFIG_USB_G_ANDROID=y
CONFIG_MMC=y
CONFIG_MMC_UNSAFE_RESUME=y
-CONFIG_SDIO_UART=y
CONFIG_MMC_OMAP=y
CONFIG_MMC_OMAP_HS=y
CONFIG_SWITCH=y