diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-12 10:48:52 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-12 10:48:52 -0400 |
| commit | 7d63b54a65ce902f9aaa8efe8192aa3b983264d4 (patch) | |
| tree | 250a77bebe92cbd6edac70a649866044295876db /net/ipv4/af_inet.c | |
| parent | fd88de569b802c4a04aaa6ee74667775f4aed8c6 (diff) | |
| parent | d8c3291c73b958243b33f8509d4507e76dafd055 (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/ipv4/af_inet.c')
| -rw-r--r-- | net/ipv4/af_inet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index dc206f1f914f..0a277453526b 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
| @@ -1257,7 +1257,7 @@ out_unregister_udp_proto: | |||
| 1257 | goto out; | 1257 | goto out; |
| 1258 | } | 1258 | } |
| 1259 | 1259 | ||
| 1260 | module_init(inet_init); | 1260 | fs_initcall(inet_init); |
| 1261 | 1261 | ||
| 1262 | /* ------------------------------------------------------------------------ */ | 1262 | /* ------------------------------------------------------------------------ */ |
| 1263 | 1263 | ||