Merge branch 'for-greg' of git://gitorious.org/usb/usb into usb-linus

[pandora-kernel.git] / arch / m68k / platform / coldfire / sltimers.c

diff --git a/arch/m68k/platform/coldfire/sltimers.c b/arch/m68k/platform/coldfire/sltimers.c
index 0a1b937..6a85daf 100644 (file)
--- a/arch/m68k/platform/coldfire/sltimers.c
+++ b/arch/m68k/platform/coldfire/sltimers.c
@@ -106,7 +106,7 @@ static cycle_t mcfslt_read_clk(struct clocksource *cs)
        cycles = mcfslt_cnt;
        local_irq_restore(flags);
 
-       /* substract because slice timers count down */
+       /* subtract because slice timers count down */
        return cycles - scnt;
 }