Merge git://git.infradead.org/mtd-2.6

[sfrench/cifs-2.6.git] / arch / arm / mach-realview / localtimer.c

diff --git a/arch/arm/mach-realview/localtimer.c b/arch/arm/mach-realview/localtimer.c
index caf6b8bb6c951e9bc29ed322a26748948681e7d4..c7bdf04ab094d1f82f2afbb52c204154cf0dfef4 100644 (file)
--- a/arch/arm/mach-realview/localtimer.c
+++ b/arch/arm/mach-realview/localtimer.c
@@ -30,7 +30,7 @@ static unsigned long mpcore_timer_rate;
 /*
  * local_timer_ack: checks for a local timer interrupt.
  *
- * If a local timer interrupt has occured, acknowledge and return 1.
+ * If a local timer interrupt has occurred, acknowledge and return 1.
  * Otherwise, return 0.
  */
 int local_timer_ack(void)