Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[deliverable/linux.git] / drivers / misc / dummy-irq.c

diff --git a/drivers/misc/dummy-irq.c b/drivers/misc/dummy-irq.c
index c37eeedfe215634775a59fa581d83f749a3fb536..4d0db15df1159815b0ea01bf80de3f20d7242034 100644 (file)
--- a/drivers/misc/dummy-irq.c
+++ b/drivers/misc/dummy-irq.c
@@ -26,7 +26,7 @@ static irqreturn_t dummy_interrupt(int irq, void *dev_id)
        static int count = 0;
 
        if (count == 0) {
-               printk(KERN_INFO "dummy-irq: interrupt occured on IRQ %d\n",
+               printk(KERN_INFO "dummy-irq: interrupt occurred on IRQ %d\n",
                                irq);
                count++;
        }