summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary King <gking@nvidia.com>2010-05-28 17:17:14 -0700
committerGary King <gking@nvidia.com>2010-05-28 17:22:25 -0700
commitfc0021e42a7e7f230651fe6703fc83cb8993bf88 (patch)
tree6873a4a7d1578afcb8727e87044f5166b3a930fe
parent09f17739a1bfeec0d90e0489c6e4a3bf6810ef43 (diff)
[ARM] harmony: update defconfig to match auto-generated file
Change-Id: Ic19d154a2825dc38c01f7ba7690f97aaa26f9313 Reviewed-on: http://git-master/r/1834 Reviewed-by: Gary King <gking@nvidia.com> Tested-by: Gary King <gking@nvidia.com>
-rw-r--r--arch/arm/configs/tegra_harmony_android_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/tegra_harmony_android_defconfig b/arch/arm/configs/tegra_harmony_android_defconfig
index 93178d5b16db..4cf361c547ba 100644
--- a/arch/arm/configs/tegra_harmony_android_defconfig
+++ b/arch/arm/configs/tegra_harmony_android_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.9
-# Fri May 28 14:43:35 2010
+# Fri May 28 17:14:59 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -224,6 +224,7 @@ CONFIG_TEGRA_NVEC=y
CONFIG_TEGRA_PCI=y
CONFIG_TEGRA_FUSE=y
# CONFIG_TEGRA_USB_CHARGE is not set
+# CONFIG_TEGRA_ODM_VIBRATE is not set
CONFIG_TEGRA_ODM_HARMONY=y
# CONFIG_TEGRA_ODM_WHISTLER is not set