diff --git a/[refs] b/[refs]
index b0585b99b009..32e8e8077350 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3db6cb42123f6dbde36122a4c81a06282370e1e
+refs/heads/master: 2db096086e8ff6c2a42881966e441157c686603b
diff --git a/trunk/net/appletalk/ddp.c b/trunk/net/appletalk/ddp.c
index 510a6782da8f..cf05c43cba52 100644
--- a/trunk/net/appletalk/ddp.c
+++ b/trunk/net/appletalk/ddp.c
@@ -1877,7 +1877,7 @@ EXPORT_SYMBOL(aarp_send_ddp);
 EXPORT_SYMBOL(atrtr_get_dev);
 EXPORT_SYMBOL(atalk_find_dev_addr);
 
-static char atalk_err_snap[] __initdata =
+static const char atalk_err_snap[] __initconst =
 	KERN_CRIT "Unable to register DDP with SNAP.\n";
 
 /* Called by proto.c on kernel start up */