git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
[pandora-kernel.git]
/
drivers
/
sh
/
clk
/
cpg.c
diff --git
a/drivers/sh/clk/cpg.c
b/drivers/sh/clk/cpg.c
index
6172335
..
82dd6fb
100644
(file)
--- a/
drivers/sh/clk/cpg.c
+++ b/
drivers/sh/clk/cpg.c
@@
-105,7
+105,7
@@
static int sh_clk_div6_set_parent(struct clk *clk, struct clk *parent)
/* Rebuild the frequency table */
clk_rate_table_build(clk, clk->freq_table, table->nr_divisors,
- table,
&clk->arch_flags
);
+ table,
NULL
);
return 0;
}