Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6-omap-h63xx.git] / drivers / s390 / char / vmwatchdog.c

diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c
index 6f40facb1c4d7e3b8f89c49e254bf22dcc959189..19f8389291b62c3f13b76eafde98ae03f1677666 100644 (file)
--- a/drivers/s390/char/vmwatchdog.c
+++ b/drivers/s390/char/vmwatchdog.c
@@ -96,7 +96,7 @@ static int vmwdt_keepalive(void)
 
        if (ret) {
                printk(KERN_WARNING "%s: problem setting interval %d, "
-                       "cmd %s\n", __FUNCTION__, vmwdt_interval,
+                       "cmd %s\n", __func__, vmwdt_interval,
                        vmwdt_cmd);
        }
        return ret;
@@ -107,7 +107,7 @@ static int vmwdt_disable(void)
        int ret = __diag288(wdt_cancel, 0, "", 0);
        if (ret) {
                printk(KERN_WARNING "%s: problem disabling watchdog\n",
-                       __FUNCTION__);
+                       __func__);
        }
        return ret;
 }