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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[pandora-kernel.git]
/
arch
/
mips
/
ar7
/
time.c
diff --git
a/arch/mips/ar7/time.c
b/arch/mips/ar7/time.c
index
5fb8a01
..
22c9321
100644
(file)
--- a/
arch/mips/ar7/time.c
+++ b/
arch/mips/ar7/time.c
@@
-30,6
+30,9
@@
void __init plat_time_init(void)
{
struct clk *cpu_clk;
{
struct clk *cpu_clk;
+ /* Initialize ar7 clocks so the CPU clock frequency is correct */
+ ar7_init_clocks();
+
cpu_clk = clk_get(NULL, "cpu");
if (IS_ERR(cpu_clk)) {
printk(KERN_ERR "unable to get cpu clock\n");
cpu_clk = clk_get(NULL, "cpu");
if (IS_ERR(cpu_clk)) {
printk(KERN_ERR "unable to get cpu clock\n");