summaryrefslogtreecommitdiffstats
path: root/net/ipv4/af_inet.c
diff options
context:
space:
mode:
authorDave Kleikamp <shaggy@austin.ibm.com>2005-07-26 09:55:10 -0500
committerDave Kleikamp <shaggy@austin.ibm.com>2005-07-26 09:55:10 -0500
commitde8fd087b280797977b012a4275ee53ff2999f3f (patch)
tree5cd65289983ad65812a6a4335fe657eeb125a7f0 /net/ipv4/af_inet.c
parent18190cc08d70a6ec8ef69f0f6ede021f7cb3f9b8 (diff)
parent6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (diff)
downloadkernel-crypto-de8fd087b280797977b012a4275ee53ff2999f3f.tar.gz
kernel-crypto-de8fd087b280797977b012a4275ee53ff2999f3f.tar.xz
kernel-crypto-de8fd087b280797977b012a4275ee53ff2999f3f.zip
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
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: