diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-11-16 10:11:20 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-16 10:11:20 +0900 |
commit | 849653372d3f98332bf84e9fb814d9f9a02eeda2 (patch) | |
tree | 0ccb6899ceb664024cc98ddfdf4b55572c45ec32 /arch/sh | |
parent | 6800e4c0ea3e96cf78953b8b5743381cb1bb9e37 (diff) | |
parent | 549015c36baadc6e67861bba6e927259e34c4d59 (diff) | |
download | kernel_samsung_crespo-849653372d3f98332bf84e9fb814d9f9a02eeda2.zip kernel_samsung_crespo-849653372d3f98332bf84e9fb814d9f9a02eeda2.tar.gz kernel_samsung_crespo-849653372d3f98332bf84e9fb814d9f9a02eeda2.tar.bz2 |
Merge branch 'common/clkfwk' into sh-fixes-for-linus
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh4/clock-sh4-202.c b/arch/sh/kernel/cpu/sh4/clock-sh4-202.c index 4eabc68c..b601fa3 100644 --- a/arch/sh/kernel/cpu/sh4/clock-sh4-202.c +++ b/arch/sh/kernel/cpu/sh4/clock-sh4-202.c @@ -110,7 +110,7 @@ static int shoc_clk_verify_rate(struct clk *clk, unsigned long rate) return 0; } -static int shoc_clk_set_rate(struct clk *clk, unsigned long rate, int algo_id) +static int shoc_clk_set_rate(struct clk *clk, unsigned long rate) { unsigned long frqcr3; unsigned int tmp; |