aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Miao <eric.miao@linaro.org>2012-01-12 13:37:06 +0800
committerEric Miao <eric.miao@linaro.org>2012-01-12 13:37:06 +0800
commit273029ebc55fe5959e0bc127e19c5f6989935a50 (patch)
tree8994bb1b7da123e8e84f60479cffe7841f058dbf
parent9ffbb68e899d0386196036a5e095ff724913f276 (diff)
downloadlinux-linaro-273029ebc55fe5959e0bc127e19c5f6989935a50.tar.gz
LINARO: fix merge error of cpu_voltage being duplicated
Signed-off-by: Eric Miao <eric.miao@linaro.org>
-rw-r--r--arch/arm/plat-mxc/include/mach/mxc.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h
index 5a4aa1a1b8c..d6062b0347c 100644
--- a/arch/arm/plat-mxc/include/mach/mxc.h
+++ b/arch/arm/plat-mxc/include/mach/mxc.h
@@ -203,13 +203,12 @@ struct cpu_op {
u32 pll_reg;
u32 pll_rate;
u32 cpu_rate;
- int cpu_voltage;
+ u32 cpu_voltage;
u32 pdr0_reg;
u32 pdf;
u32 mfi;
u32 mfd;
u32 mfn;
- u32 cpu_voltage;
u32 cpu_podf;
};