projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[cascardo/linux.git]
/
arch
/
sh
/
kernel
/
cpu
/
sh2a
/
clock-sh7201.c
diff --git
a/arch/sh/kernel/cpu/sh2a/clock-sh7201.c
b/arch/sh/kernel/cpu/sh2a/clock-sh7201.c
index
b26264d
..
c509c40
100644
(file)
--- a/
arch/sh/kernel/cpu/sh2a/clock-sh7201.c
+++ b/
arch/sh/kernel/cpu/sh2a/clock-sh7201.c
@@
-34,7
+34,7
@@
static const int pfc_divisors[]={1,2,3,4,6,8,12};
static void master_clk_init(struct clk *clk)
{
-
return
10000000 * PLL2 * pll1rate[(__raw_readw(FREQCR) >> 8) & 0x0007];
+
clk->rate =
10000000 * PLL2 * pll1rate[(__raw_readw(FREQCR) >> 8) & 0x0007];
}
static struct clk_ops sh7201_master_clk_ops = {