Merge branch 'fortglx/39/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux...

[pandora-kernel.git] / drivers / rtc / interface.c

diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index b2fea80..ef6316a 100644 (file)
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -480,7 +480,7 @@ EXPORT_SYMBOL_GPL(rtc_update_irq_enable);
  * @rtc: pointer to the rtc device
  *
  * This function is called when an AIE, UIE or PIE mode interrupt
  * @rtc: pointer to the rtc device
  *
  * This function is called when an AIE, UIE or PIE mode interrupt

- * has occured (or been emulated).
+ * has occurred (or been emulated).

  *
  * Triggers the registered irq_task function callback.
  */
  *
  * Triggers the registered irq_task function callback.
  */