commit 373d1d02ff733804598a6a1894c42dcc9978abbe
author Jeffrey Chuang <fchuang@codeaurora.org> Fri Jul 22 16:49:33 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 10:26:22 2011 -0700
tree 0d48297623b8a78b379f009bcbe1ac23c9671ba3
parent c7c0db6840c8d6b28938857eb208c67f1696516e

Revert "Revert "msm: 8960: Enable bus scaling on 8960"."

This reverts commit 133580fadbade969050b2a8dd9f7e9451397bfa7.

Signed-off-by: Jeffrey Chuang <fchuang@codeaurora.org>

Conflicts:

	arch/arm/configs/msm8960_defconfig

arch/arm/configs/msm8960_defconfig

diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig
index ab59609..434f632 100644
--- a/arch/arm/configs/msm8960_defconfig
+++ b/arch/arm/configs/msm8960_defconfig
@@ -52,6 +52,7 @@
 # CONFIG_MSM_HW3D is not set
 CONFIG_MSM_SUBSYSTEM_RESTART=y
 CONFIG_MSM_MODEM_8960=y
+CONFIG_MSM_BUS_SCALING=y
 CONFIG_MSM_WATCHDOG=y
 CONFIG_MSM_DLOAD_MODE=y
 CONFIG_NO_HZ=y