Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo...

[karo-tx-linux.git] / arch / blackfin / mm / sram-alloc.c

diff --git a/arch/blackfin/mm/sram-alloc.c b/arch/blackfin/mm/sram-alloc.c
index 342e378da1ece760b2c2b3531780cad9b897b95a..1f3b3ef3e103fbe3581670a62d03db2c5da9e153 100644 (file)
--- a/arch/blackfin/mm/sram-alloc.c
+++ b/arch/blackfin/mm/sram-alloc.c
@@ -191,7 +191,7 @@ static irqreturn_t l2_ecc_err(int irq, void *dev_id)
 {
        int status;
 
-       printk(KERN_ERR "L2 ecc error happend\n");
+       printk(KERN_ERR "L2 ecc error happened\n");
        status = bfin_read32(L2CTL0_STAT);
        if (status & 0x1)
                printk(KERN_ERR "Core channel error type:0x%x, addr:0x%x\n",