aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Miao <eric.miao@linaro.org>2011-10-22 10:21:32 +0800
committerEric Miao <eric.miao@linaro.org>2011-10-22 10:21:32 +0800
commite92963afdd9cef4b5d9a9a88ebb2b4b0eb89056e (patch)
tree881f4960c36dccae81d6eb6dad309c48e3b282e0
parent3348db29d0754ac8c4a3d37f139fd4b90f70076d (diff)
downloadlinux-linaro-e92963afdd9cef4b5d9a9a88ebb2b4b0eb89056e.tar.gz
imx5_android_defconfig: disable a.out temporarily and enable TEST_POWERandroid-release-2011-10-1lt-3.1-android
Signed-off-by: Eric Miao <eric.miao@linaro.org>
-rw-r--r--arch/arm/configs/imx5_android_defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/imx5_android_defconfig b/arch/arm/configs/imx5_android_defconfig
index b228d776673..2ede7bc8d68 100644
--- a/arch/arm/configs/imx5_android_defconfig
+++ b/arch/arm/configs/imx5_android_defconfig
@@ -507,7 +507,7 @@ CONFIG_NEON=y
CONFIG_BINFMT_ELF=y
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_HAVE_AOUT=y
-CONFIG_BINFMT_AOUT=m
+# CONFIG_BINFMT_AOUT is not set
CONFIG_BINFMT_MISC=m
#
@@ -1531,7 +1531,7 @@ CONFIG_W1_MASTER_MXC=y
CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
# CONFIG_PDA_POWER is not set
-# CONFIG_TEST_POWER is not set
+CONFIG_TEST_POWER=y
# CONFIG_BATTERY_DS2780 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_BQ20Z75 is not set