diff options
| author | Vaibhav Hiremath <hvaibhav@ti.com> | 2013-05-06 16:39:16 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-05-06 16:39:16 -0700 |
| commit | 626479696d2b0c3a68a4fd24c3ee759c7d2b4ea1 (patch) | |
| tree | 09ae611224551d1fff25c83a8bbc9ef6ffac572d /arch/powerpc/kernel/swsusp_asm64.S | |
| parent | dc2d3db8137fba0f62d7517e1bea8a47f69fcbc4 (diff) | |
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>
Diffstat (limited to 'arch/powerpc/kernel/swsusp_asm64.S')
0 files changed, 0 insertions, 0 deletions