From f1699a79439dacfa3663a9d61e211cb3e91d8d16 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 25 Aug 2008 15:18:15 -0700
Subject: [PATCH] --- yaml --- r: 109120 b: refs/heads/master c:
 ce3113ec57abcd41cc5a2fed02474aee3f63d12c h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/net/ipv6/sysctl_net_ipv6.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3f3e4edc4aee..a41ed6131018 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f4520d35d89ca6c5cd129c38e3b11f0283b7d1b
+refs/heads/master: ce3113ec57abcd41cc5a2fed02474aee3f63d12c
diff --git a/trunk/net/ipv6/sysctl_net_ipv6.c b/trunk/net/ipv6/sysctl_net_ipv6.c
index e6dfaeac6be3..587f8f60c489 100644
--- a/trunk/net/ipv6/sysctl_net_ipv6.c
+++ b/trunk/net/ipv6/sysctl_net_ipv6.c
@@ -156,7 +156,7 @@ static struct ctl_table_header *ip6_base;
 int ipv6_static_sysctl_register(void)
 {
 	static struct ctl_table empty[1];
-	ip6_base = register_net_sysctl_rotable(net_ipv6_ctl_path, empty);
+	ip6_base = register_sysctl_paths(net_ipv6_ctl_path, empty);
 	if (ip6_base == NULL)
 		return -ENOMEM;
 	return 0;