commit ef61eb9988179a2ee9e31a61018c754d68644b2f
author Linux Build Service Account <lnxbuild@localhost> Sat Sep 15 13:53:32 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Sep 15 13:53:30 2012 -0700
tree b6bfb2754ae09d62e2a79198b41aaabf939b6ca9
parent ddda9e33baa27a3e2d1d670ff1aaa867eb0b7fcd
parent dadc973aa6b0c0b6775daaa622e4c4d4010fcac9

Merge "defconfig: 8974: add defconfig options for msm8226"

arch/arm/configs/msm8974_defconfig

diff --git a/arch/arm/configs/msm8974_defconfig b/arch/arm/configs/msm8974_defconfig
index 53c2211..471ecd9 100644
--- a/arch/arm/configs/msm8974_defconfig
+++ b/arch/arm/configs/msm8974_defconfig
@@ -32,6 +32,7 @@
 CONFIG_EFI_PARTITION=y
 CONFIG_ARCH_MSM=y
 CONFIG_ARCH_MSM8974=y
+CONFIG_ARCH_MSM8226=y
 CONFIG_MSM_KRAIT_TBB_ABORT_HANDLER=y
 # CONFIG_MSM_STACKED_MEMORY is not set
 CONFIG_KERNEL_PMEM_EBI_REGION=y
@@ -77,7 +78,6 @@
 CONFIG_HIGHMEM=y
 CONFIG_VMALLOC_RESERVE=0x19000000
 CONFIG_USE_OF=y
-CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y