From c853d33852448a1bb9fa82718daff05fac669495 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 31 Jul 2008 20:51:22 -0700
Subject: [PATCH] --- yaml --- r: 107354 b: refs/heads/master c:
 8a9204db665365354b349ed5b0bc054f0433a2a4 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv4/route.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2959bb2f0738..aa1c042dd6d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90b7e1120bb43ffaabb88d28f80a0c2e13167b15
+refs/heads/master: 8a9204db665365354b349ed5b0bc054f0433a2a4
diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
index 380d6474cf66..d7bf0564b5f4 100644
--- a/trunk/net/ipv4/route.c
+++ b/trunk/net/ipv4/route.c
@@ -3222,7 +3222,9 @@ int __init ip_rt_init(void)
  */
 void __init ip_static_sysctl_init(void)
 {
+#ifdef CONFIG_SYSCTL
 	register_sysctl_paths(ipv4_route_path, ipv4_route_table);
+#endif
 }
 
 EXPORT_SYMBOL(__ip_select_ident);