ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a