diff --git a/[refs] b/[refs]
index 74ee02b4b9f0..1cb88a8767f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ff0feac88ced864f44adb145142269196fa79d9
+refs/heads/master: 278f015e9b67566991d4e831fe38e0ebbeef245e
diff --git a/trunk/net/appletalk/ddp.c b/trunk/net/appletalk/ddp.c
index 0301b328cf0f..86852963b7f7 100644
--- a/trunk/net/appletalk/ddp.c
+++ b/trunk/net/appletalk/ddp.c
@@ -1208,9 +1208,7 @@ static int atalk_connect(struct socket *sock, struct sockaddr *uaddr,
 	if (addr->sat_addr.s_node == ATADDR_BCAST &&
 	    !sock_flag(sk, SOCK_BROADCAST)) {
 #if 1
-		printk(KERN_WARNING "%s is broken and did not set "
-				    "SO_BROADCAST. It will break when 2.2 is "
-				    "released.\n",
+		pr_warn("atalk_connect: %s is broken and did not set SO_BROADCAST.\n",
 			current->comm);
 #else
 		return -EACCES;