Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / arch / arm / mach-vexpress / spc.c

diff --git a/arch/arm/mach-vexpress/spc.c b/arch/arm/mach-vexpress/spc.c
index 8409cab3f760cc798a14cadc5f017feab53d1b65..fe488523694c17618835e0224347de7a377a821b 100644 (file)
--- a/arch/arm/mach-vexpress/spc.c
+++ b/arch/arm/mach-vexpress/spc.c
@@ -31,6 +31,8 @@
 
 #include <asm/cacheflush.h>
 
+#include "spc.h"
+
 #define SPCLOG "vexpress-spc: "
 
 #define PERF_LVL_A15           0x00
@@ -319,17 +321,15 @@ static int ve_spc_waitforcompletion(int req_type)
 
 static int ve_spc_set_performance(int cluster, u32 freq)
 {
-       u32 perf_cfg_reg, perf_stat_reg;
+       u32 perf_cfg_reg;
        int ret, perf, req_type;
 
        if (cluster_is_a15(cluster)) {
                req_type = CA15_DVFS;
                perf_cfg_reg = PERF_LVL_A15;
-               perf_stat_reg = PERF_REQ_A15;
        } else {
                req_type = CA7_DVFS;
                perf_cfg_reg = PERF_LVL_A7;
-               perf_stat_reg = PERF_REQ_A7;
        }
 
        perf = ve_spc_find_performance_index(cluster, freq);