Merge 'akpm' patch series

[karo-tx-linux.git] / arch / arm / mach-tegra / tegra2_clocks.c

diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c
index 4459470c052de3f97ea29ec138c0a2006787328b..bb618075fab67911b97bf757147cc85b425bc40d 100644 (file)
--- a/arch/arm/mach-tegra/tegra2_clocks.c
+++ b/arch/arm/mach-tegra/tegra2_clocks.c
@@ -337,7 +337,7 @@ static int tegra2_super_clk_set_parent(struct clk *c, struct clk *p)
        const struct clk_mux_sel *sel;
        int shift;
 
-       val = clk_readl(c->reg + SUPER_CLK_MUX);;
+       val = clk_readl(c->reg + SUPER_CLK_MUX);
        BUG_ON(((val & SUPER_STATE_MASK) != SUPER_STATE_RUN) &&
                ((val & SUPER_STATE_MASK) != SUPER_STATE_IDLE));
        shift = ((val & SUPER_STATE_MASK) == SUPER_STATE_IDLE) ?