diff --git a/[refs] b/[refs]
index c0b575f603c7..386f9c50a237 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 641912f479962e50b29573a8c0e8c514eb02e9b8
+refs/heads/master: a2b89cd85ed55029400521a93dde868ac7150b31
diff --git a/trunk/drivers/watchdog/machzwd.c b/trunk/drivers/watchdog/machzwd.c
index 2d118cf022fc..edffe68e3d2f 100644
--- a/trunk/drivers/watchdog/machzwd.c
+++ b/trunk/drivers/watchdog/machzwd.c
@@ -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]);
 }