]> git.baikalelectronics.ru Git - kernel.git/commit
ARM: OMAP2+: Fix mismerge for timer.c between d2a4431d and b7bbeee7
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)
commita84942b07f3cfe8cc9354ac8c083e8b60fbbb3f8
tree09ae611224551d1fff25c83a8bbc9ef6ffac572d
parent6046630790862c86d031f92b0882a1e900d246e4
ARM: OMAP2+: Fix mismerge for timer.c between d2a4431d and b7bbeee7

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