summaryrefslogtreecommitdiffstats
path: root/net/ipv4/af_inet.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-22 16:33:00 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-22 16:33:00 -0700
commit38afd6adf6bccd7176e88c07cac104d3639aa30d (patch)
tree2142409984b609e51ef60b6a14318dd4e878718a /net/ipv4/af_inet.c
parent8ed1383fb7b6685968588141d5934e0e6715e954 (diff)
parent261688d01ec07d3a265b8ace6ec68310fbd96a96 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/af_inet.c')
-rw-r--r--net/ipv4/af_inet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index ef7468376ae..163ae4068b5 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1157,7 +1157,7 @@ static int __init ipv4_proc_init(void)
#ifdef CONFIG_IP_FIB_TRIE
if (fib_stat_proc_init())
goto out_fib_stat;
- #endif
+#endif
if (ip_misc_proc_init())
goto out_misc;
out: