Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra

[pandora-kernel.git] / arch / m68k / include / asm / mcftimer.h

diff --git a/arch/m68k/include/asm/mcftimer.h b/arch/m68k/include/asm/mcftimer.h
index 92b276f..351c272 100644 (file)
--- a/arch/m68k/include/asm/mcftimer.h
+++ b/arch/m68k/include/asm/mcftimer.h
@@ -27,7 +27,7 @@
 
 /*
  *     Bit definitions for the Timer Mode Register (TMR).
- *     Register bit flags are common accross ColdFires.
+ *     Register bit flags are common across ColdFires.
  */
 #define        MCFTIMER_TMR_PREMASK    0xff00          /* Prescalar mask */
 #define        MCFTIMER_TMR_DISCE      0x0000          /* Disable capture */