| commit | 8b24db40b44161be58f05f426fed2ca1abc2c4aa | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Sat Nov 19 06:35:27 2011 -0800 |
| committer | QuIC Gerrit Code Review <code-review@localhost> | Sat Nov 19 06:35:27 2011 -0800 |
| tree | 5a2b2979cca38179956cc002ed82e6bc513475f3 | |
| parent | 517a34cb37c2ddf40b78eeacc79d5c452a1d74ea [diff] | |
| parent | 05b38acf9079572dbe57b995637f51c84c443e06 [diff] |
Merge "defconfig: 8960: Enable tz_log platform device driver" into msm-3.0
diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig index c41f64c..f9117cb 100755 --- a/arch/arm/configs/msm8960_defconfig +++ b/arch/arm/configs/msm8960_defconfig
@@ -63,6 +63,7 @@ CONFIG_MSM_LPASS_8960=y CONFIG_MSM_WCNSS_SSR_8960=y CONFIG_MSM_RPM_LOG=y +CONFIG_MSM_TZ_LOG=y CONFIG_MSM_RPM_STATS_LOG=y CONFIG_MSM_BUS_SCALING=y CONFIG_MSM_BUS_RPM_MULTI_TIER_ENABLED=y