| commit | 181718671488cde17ef47cd3a62952bed24f5712 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Sat May 18 11:56:56 2013 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Sat May 18 11:56:56 2013 -0700 |
| tree | 9bf507914508cfab1bb765ca83dfc169d6bb4f0a | |
| parent | 4a96c3b877e67b12e5338164cda69107a89a3e88 [diff] | |
| parent | ed41904671b06b3fb4c3640fba7cccdf6b61de87 [diff] |
Merge "defconfig: MSM8974: Add support for MSMSAMARIUM"
diff --git a/arch/arm/configs/msm8974_defconfig b/arch/arm/configs/msm8974_defconfig index 8036a44..091cdd9 100644 --- a/arch/arm/configs/msm8974_defconfig +++ b/arch/arm/configs/msm8974_defconfig
@@ -37,6 +37,7 @@ CONFIG_DEFAULT_ROW=y CONFIG_ARCH_MSM=y CONFIG_ARCH_MSM8974=y +CONFIG_ARCH_MSMSAMARIUM=y CONFIG_MSM_KRAIT_TBB_ABORT_HANDLER=y # CONFIG_MSM_STACKED_MEMORY is not set CONFIG_CPU_HAS_L2_PMU=y