ARM: OMAP2+: Fix mismerge for timer.c between 336ff8c5 and dc9e5383

ARM: OMAP2+: Fix mismerge for timer.c between 336ff8c5 and dc9e5383

Looks like the timer.c fixes in commit 336ff8c5 (ARM: OMAP: clocks:
Delay clk inits atleast until slab is initialized) got lost in a
merge with dc9e5383 (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>