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 /drivers/sh/clk/cpg.c | |
parent | 6800e4c0ea3e96cf78953b8b5743381cb1bb9e37 (diff) | |
parent | 549015c36baadc6e67861bba6e927259e34c4d59 (diff) | |
download | kernel_samsung_smdk4412-849653372d3f98332bf84e9fb814d9f9a02eeda2.zip kernel_samsung_smdk4412-849653372d3f98332bf84e9fb814d9f9a02eeda2.tar.gz kernel_samsung_smdk4412-849653372d3f98332bf84e9fb814d9f9a02eeda2.tar.bz2 |
Merge branch 'common/clkfwk' into sh-fixes-for-linus
Diffstat (limited to 'drivers/sh/clk/cpg.c')
-rw-r--r-- | drivers/sh/clk/cpg.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c index 3aea5f0..359e9a3 100644 --- a/drivers/sh/clk/cpg.c +++ b/drivers/sh/clk/cpg.c @@ -110,8 +110,7 @@ static int sh_clk_div6_set_parent(struct clk *clk, struct clk *parent) return 0; } -static int sh_clk_div6_set_rate(struct clk *clk, - unsigned long rate, int algo_id) +static int sh_clk_div6_set_rate(struct clk *clk, unsigned long rate) { unsigned long value; int idx; @@ -253,7 +252,7 @@ static int sh_clk_div4_set_parent(struct clk *clk, struct clk *parent) return 0; } -static int sh_clk_div4_set_rate(struct clk *clk, unsigned long rate, int algo_id) +static int sh_clk_div4_set_rate(struct clk *clk, unsigned long rate) { struct clk_div4_table *d4t = clk->priv; unsigned long value; |