ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a
authorVaibhav Hiremath <hvaibhav@ti.com>
Mon, 6 May 2013 23:39:16 +0000 (16:39 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 6 May 2013 23:39:16 +0000 (16:39 -0700)
commit626479696d2b0c3a68a4fd24c3ee759c7d2b4ea1
tree09ae611224551d1fff25c83a8bbc9ef6ffac572d
parentdc2d3db8137fba0f62d7517e1bea8a47f69fcbc4
ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a

Looks like the timer.c fixes in commit ff931c82 (ARM: OMAP: clocks:
Delay clk inits atleast until slab is initialized) got lost in a
merge with da4a686a (ARM: smp_twd: convert to use CLKSRC_OF init).

Without the omap_clk_init() calls none of OMAP family of devices
boot.

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
[tony@atomide.com: updated comments to describe merge error]
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/timer.c