path: root/drivers/sh
diff options
authorArnd Bergmann <>2012-11-13 13:48:02 +0100
committerArnd Bergmann <>2012-11-13 13:48:02 +0100
commit97b129be91bc978a205db24241840b95cfa28325 (patch)
treec9a431561f738d39a1a2c6dbed94af838f7d3b35 /drivers/sh
parent9e0c6b1f47b7cd8e2ce542575573d7c235759ff9 (diff)
parent94091c6b9498116abe3035137d8c3e707528efd0 (diff)
Merge branch 'soc4' of git:// into next/soc2
Its a little embarrassing, but they all fix problems introduced in previous pull-requests for 3.8 that have been merged. * The three Revert patches back-out secondary CPU initialisation changes from Bastian Hecht which he as advised me are incorrect and break secondary CPU initialisation. * The clkfwk patch from Morimoto-san resolves a build warning. * 'soc4' of git:// sh: clkfwk: fixup unsed variable warning Revert "ARM: shmobile: r8a7779: Replace modify_scu_cpu_psr with scu_power_mode" Revert "ARM: shmobile: sh73a0: Replace modify_scu_cpu_psr with scu_power_mode" Revert "ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode" Signed-off-by: Arnd Bergmann <>
Diffstat (limited to 'drivers/sh')
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c
index b3dc44146ca0..5aedcdf4ac5c 100644
--- a/drivers/sh/clk/cpg.c
+++ b/drivers/sh/clk/cpg.c
@@ -401,7 +401,6 @@ static int fsidiv_enable(struct clk *clk)
static int fsidiv_set_rate(struct clk *clk, unsigned long rate)
- u32 val;
int idx;
idx = (clk->parent->rate / rate) & 0xffff;