diff --git a/[refs] b/[refs]
index ba93a8d555ee..fe22ae5ce0d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f34fbb971368c20f757f8758833a534590b16518
+refs/heads/master: cbeb321a64af5437fbde249605b191ff0fdfa21c
diff --git a/trunk/net/nonet.c b/trunk/net/nonet.c
index e5241dceaa57..1230f0ae832e 100644
--- a/trunk/net/nonet.c
+++ b/trunk/net/nonet.c
@@ -14,11 +14,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 
-void __init sock_init(void)
-{
-	printk(KERN_INFO "Linux NoNET1.0 for Linux 2.6\n");
-}
-
 static int sock_no_open(struct inode *irrelevant, struct file *dontcare)
 {
 	return -ENXIO;
diff --git a/trunk/net/socket.c b/trunk/net/socket.c
index 98be7ef3c086..f40957adc7c7 100644
--- a/trunk/net/socket.c
+++ b/trunk/net/socket.c
@@ -2063,6 +2063,8 @@ static int __init sock_init(void)
 #ifdef CONFIG_NETFILTER
 	netfilter_init();
 #endif
+
+	return 0;
 }
 
 core_initcall(sock_init);	/* early initcall */