Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[linux-2.6-omap-h63xx.git] / arch / mips / sgi-ip32 / ip32-reset.c

diff --git a/arch/mips/sgi-ip32/ip32-reset.c b/arch/mips/sgi-ip32/ip32-reset.c
index 624bbdbff2a8bf40d47ae412d5361b43369b9b36..b6cab089561e117cc4a4fc785cdd10d5b0f736bf 100644 (file)
--- a/arch/mips/sgi-ip32/ip32-reset.c
+++ b/arch/mips/sgi-ip32/ip32-reset.c
@@ -142,7 +142,7 @@ static irqreturn_t ip32_rtc_int(int irq, void *dev_id)
        reg_c = CMOS_READ(RTC_INTR_FLAGS);
        if (!(reg_c & RTC_IRQF)) {
                printk(KERN_WARNING
-                       "%s: RTC IRQ without RTC_IRQF\n", __FUNCTION__);
+                       "%s: RTC IRQ without RTC_IRQF\n", __func__);
        }
        /* Wait until interrupt goes away */
        disable_irq(MACEISA_RTC_IRQ);