Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[linux.git] / arch / mips / bcm63xx / timer.c

diff --git a/arch/mips/bcm63xx/timer.c b/arch/mips/bcm63xx/timer.c
index 5f11359815688d5350a56cce5704971e4e533b1a..2110359c00e5cb79cf1b04b21c73c83e81f79ea8 100644 (file)
--- a/arch/mips/bcm63xx/timer.c
+++ b/arch/mips/bcm63xx/timer.c
@@ -195,7 +195,7 @@ int bcm63xx_timer_init(void)
        irq = bcm63xx_get_irq_number(IRQ_TIMER);
        ret = request_irq(irq, timer_interrupt, 0, "bcm63xx_timer", NULL);
        if (ret) {
-               printk(KERN_ERR "bcm63xx_timer: failed to register irq\n");
+               pr_err("%s: failed to register irq\n", __func__);
                return ret;
        }