git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6]
/
arch
/
arm
/
mach-ux500
/
cpu.c
diff --git
a/arch/arm/mach-ux500/cpu.c
b/arch/arm/mach-ux500/cpu.c
index
d81ad02
..
e0fd747
100644
(file)
--- a/
arch/arm/mach-ux500/cpu.c
+++ b/
arch/arm/mach-ux500/cpu.c
@@
-62,6
+62,12
@@
void __init ux500_init_irq(void)
{
gic_dist_init(0, __io_address(UX500_GIC_DIST_BASE), 29);
gic_cpu_init(0, __io_address(UX500_GIC_CPU_BASE));
+
+ /*
+ * Init clocks here so that they are available for system timer
+ * initialization.
+ */
+ clk_init();
}
#ifdef CONFIG_CACHE_L2X0