Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify

[karo-tx-linux.git] / drivers / watchdog / machzwd.c

diff --git a/drivers/watchdog/machzwd.c b/drivers/watchdog/machzwd.c
index 2d118cf022fc67fbfeeb0eb1c026dfaab4c9ecb5..928035069396e8117dedca9c5284b7841057d372 100644 (file)
--- a/drivers/watchdog/machzwd.c
+++ b/drivers/watchdog/machzwd.c
@@ -143,7 +143,7 @@ static unsigned long next_heartbeat;
 #ifndef ZF_DEBUG
 #      define dprintk(format, args...)
 #else
-#      define dprintk(format, args...) printk(KERN_DEBUG PFX
+#      define dprintk(format, args...) printk(KERN_DEBUG PFX \
                                ":%s:%d: " format, __func__, __LINE__ , ## args)
 #endif
 
@@ -388,7 +388,7 @@ static struct notifier_block zf_notifier = {
 
 static void __init zf_show_action(int act)
 {
-       char *str[] = { "RESET", "SMI", "NMI", "SCI" };
+       static const char * const str[] = { "RESET", "SMI", "NMI", "SCI" };
 
        printk(KERN_INFO PFX ": Watchdog using action = %s\n", str[act]);
 }