aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDima Zavin <dima@android.com>2011-03-29 14:35:01 -0700
committerDima Zavin <dima@android.com>2011-03-29 14:35:01 -0700
commitd3d61f7d1426a6719055cde4facc729e8661d2c2 (patch)
treeb1c1ee4c81062f34a377f3126919ffaf514eebc1
parent6b97d1bac2f90ec53a46a0f4cdc87579efe1bbaf (diff)
downloadexperimental-sandbox/dima/android-msm-2.6.38-wip.tar.gz
ARM: configs: msm: update mahimahi defconfigsandbox/dima/android-msm-2.6.38-wip
Change-Id: I56c35070f06e6ee9759d5de4a3c9f1a581adeb7d Signed-off-by: Dima Zavin <dima@android.com>
-rw-r--r--arch/arm/configs/mahimahi_defconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/configs/mahimahi_defconfig b/arch/arm/configs/mahimahi_defconfig
index 8544abd4438..47bba92c192 100644
--- a/arch/arm/configs/mahimahi_defconfig
+++ b/arch/arm/configs/mahimahi_defconfig
@@ -161,9 +161,9 @@ CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_MISC_DEVICES=y
-CONFIG_UID_STAT=y
CONFIG_SENSORS_AKM8973=y
CONFIG_VP_A1026=y
+CONFIG_UID_STAT=y
CONFIG_MD=y
CONFIG_BLK_DEV_DM=y
CONFIG_DM_DEBUG=y
@@ -212,7 +212,7 @@ CONFIG_REGULATOR=y
CONFIG_REGULATOR_DEBUG=y
CONFIG_REGULATOR_TPS65023=y
CONFIG_MEDIA_SUPPORT=y
-# CONFIG_IR_CORE is not set
+# CONFIG_RC_CORE is not set
CONFIG_MSM_CAMERA=y
CONFIG_S5K3E2FX=y
CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -266,7 +266,6 @@ CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y
# CONFIG_DNOTIFY is not set
-CONFIG_INOTIFY=y
CONFIG_VFAT_FS=y
CONFIG_TMPFS=y
CONFIG_YAFFS_FS=y