From 02a870484721fc8694c9d32554706989c45063a7 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Sat, 21 Jul 2007 12:53:19 -0600
Subject: [PATCH] --- yaml --- r: 62761 b: refs/heads/master c:
 b053c204edbc82b068fe8cfc809b7f90b885fae0 h: refs/heads/master i:   62759:
 cbb79cd94d156ad4035cb63cfcf09a41671efd2c v: v3

---
 [refs]                |  2 +-
 trunk/net/9p/sysctl.c | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index f308a52d74ce..753ee970524f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f56d35e7aa78ac56a93ff43da90e8d90a37a1362
+refs/heads/master: b053c204edbc82b068fe8cfc809b7f90b885fae0
diff --git a/trunk/net/9p/sysctl.c b/trunk/net/9p/sysctl.c
index e7fe706ab95a..8b61027a24ea 100644
--- a/trunk/net/9p/sysctl.c
+++ b/trunk/net/9p/sysctl.c
@@ -28,15 +28,10 @@
 #include <linux/init.h>
 #include <net/9p/9p.h>
 
-enum {
-	P9_SYSCTL_NET = 487,
-	P9_SYSCTL_DEBUG = 1,
-};
-
-static ctl_table p9_table[] = {
+static struct ctl_table p9_table[] = {
 #ifdef CONFIG_NET_9P_DEBUG
 	{
-		.ctl_name       = P9_SYSCTL_DEBUG,
+		.ctl_name       = CTL_UNNUMBERED,
 		.procname       = "debug",
 		.data           = &p9_debug_level,
 		.maxlen         = sizeof(int),
@@ -44,21 +39,21 @@ static ctl_table p9_table[] = {
 		.proc_handler   = &proc_dointvec
 	},
 #endif
-	{	.ctl_name	= 0 },
+	{},
 };
 
-static ctl_table p9_net_table[] = {
+static struct ctl_table p9_net_table[] = {
 	{
-		.ctl_name	= P9_SYSCTL_NET,
+		.ctl_name	= CTL_UNNUMBERED,
 		.procname	= "9p",
 		.maxlen		= 0,
 		.mode		= 0555,
 		.child		= p9_table,
 	},
-	{	.ctl_name	= 0 },
+	{},
 };
 
-static ctl_table p9_ctl_table[] = {
+static struct ctl_table p9_ctl_table[] = {
 	{
 		.ctl_name	= CTL_NET,
 		.procname	= "net",
@@ -66,7 +61,7 @@ static ctl_table p9_ctl_table[] = {
 		.mode		= 0555,
 		.child		= p9_net_table,
 	},
-	{	.ctl_name	= 0 },
+	{},
 };
 
 static struct ctl_table_header *p9_table_header;