diff options
-rw-r--r-- | net/nonet.c | 5 | ||||
-rw-r--r-- | net/socket.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/net/nonet.c b/net/nonet.c index e5241dceaa57..1230f0ae832e 100644 --- a/net/nonet.c +++ b/net/nonet.c | |||
@@ -14,11 +14,6 @@ | |||
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
16 | 16 | ||
17 | void __init sock_init(void) | ||
18 | { | ||
19 | printk(KERN_INFO "Linux NoNET1.0 for Linux 2.6\n"); | ||
20 | } | ||
21 | |||
22 | static int sock_no_open(struct inode *irrelevant, struct file *dontcare) | 17 | static int sock_no_open(struct inode *irrelevant, struct file *dontcare) |
23 | { | 18 | { |
24 | return -ENXIO; | 19 | return -ENXIO; |
diff --git a/net/socket.c b/net/socket.c index 98be7ef3c086..f40957adc7c7 100644 --- a/net/socket.c +++ b/net/socket.c | |||
@@ -2063,6 +2063,8 @@ static int __init sock_init(void) | |||
2063 | #ifdef CONFIG_NETFILTER | 2063 | #ifdef CONFIG_NETFILTER |
2064 | netfilter_init(); | 2064 | netfilter_init(); |
2065 | #endif | 2065 | #endif |
2066 | |||
2067 | return 0; | ||
2066 | } | 2068 | } |
2067 | 2069 | ||
2068 | core_initcall(sock_init); /* early initcall */ | 2070 | core_initcall(sock_init); /* early initcall */ |