Merge branch 'master' into for-next

[mv-sheeva.git] / arch / h8300 / kernel / timer / itu.c

diff --git a/arch/h8300/kernel/timer/itu.c b/arch/h8300/kernel/timer/itu.c
index 4883ba7103a84d8b391a290fc64198949f2c3ca9..a2ae5e9521378d6adbee4e01d39e7843819c305a 100644 (file)
--- a/arch/h8300/kernel/timer/itu.c
+++ b/arch/h8300/kernel/timer/itu.c
@@ -73,7 +73,7 @@ void __init h8300_timer_setup(void)
 
        setup_irq(ITUIRQ, &itu_irq);
 
-       /* initalize timer */
+       /* initialize timer */
        ctrl_outb(0, TSTR);
        ctrl_outb(CCLR0 | div, ITUBASE + TCR);
        ctrl_outb(0x01, ITUBASE + TIER);