summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTapani <tapani@vmail.me>2013-01-13 12:20:44 +0100
committerJohn Weber <rjohnweber@gmail.com>2013-07-28 23:44:33 -0500
commit5ff30ca8128bb3840350e5902ac68246fbc2aa21 (patch)
tree447c21cfb57a464507942f20c72ea2c3cbf804cf
parentf21764444c5515ca62b54928ea9dbffaa300cf2d (diff)
downloadlinux-5ff30ca8128bb3840350e5902ac68246fbc2aa21.tar.gz
Fix compile break in arch/arm/plat-mxc/dvfs_core.c when SMP is configured without CPU_FREQ
Conflicts: arch/arm/plat-mxc/dvfs_core.c (cherry picked from commit 1195fac5d0324c267660b706f5e347e003728d13)
-rwxr-xr-xarch/arm/plat-mxc/dvfs_core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/dvfs_core.c b/arch/arm/plat-mxc/dvfs_core.c
index b5cfba1a5047..ab6737823312 100755
--- a/arch/arm/plat-mxc/dvfs_core.c
+++ b/arch/arm/plat-mxc/dvfs_core.c
@@ -586,6 +586,9 @@ static void dvfs_core_work_handler(struct work_struct *work)
int ret = 0;
int low_freq_bus_ready = 0;
int bus_incr = 0, cpu_dcr = 0;
+#ifdef CONFIG_ARCH_MX5
+ int disable_dvfs_irq = 0;
+#endif
int cpu;
low_freq_bus_ready = low_freq_bus_used();