From fe161daa746e4a93c0ad48d31ec0853c28b0fd1f Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Wed, 14 Feb 2007 00:33:37 -0800
Subject: [PATCH] --- yaml --- r: 48354 b: refs/heads/master c:
 77f6dfb1295cae6e4cbbb90fc6da88fdf27ee95e h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/frv/kernel/sysctl.c | 1 -
 trunk/include/linux/sysctl.h   | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 60c98f856505..d888dc74830b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: febe1c257901c766a938007ed3710e7d54618756
+refs/heads/master: 77f6dfb1295cae6e4cbbb90fc6da88fdf27ee95e
diff --git a/trunk/arch/frv/kernel/sysctl.c b/trunk/arch/frv/kernel/sysctl.c
index ce676803eb6f..2f4da32fba20 100644
--- a/trunk/arch/frv/kernel/sysctl.c
+++ b/trunk/arch/frv/kernel/sysctl.c
@@ -186,7 +186,6 @@ static struct ctl_table frv_table[] =
  * Use a temporary sysctl number. Horrid, but will be cleaned up in 2.6
  * when all the PM interfaces exist nicely.
  */
-#define CTL_FRV 9898
 static struct ctl_table frv_dir_table[] =
 {
 	{CTL_FRV, "frv", NULL, 0, 0555, frv_table},
diff --git a/trunk/include/linux/sysctl.h b/trunk/include/linux/sysctl.h
index bb2a0e6aaa8d..113b92bbe4b9 100644
--- a/trunk/include/linux/sysctl.h
+++ b/trunk/include/linux/sysctl.h
@@ -72,6 +72,7 @@ enum
 	CTL_CPU=10,		/* CPU stuff (speed scaling, etc) */
 	CTL_SUNRPC=7249,	/* sunrpc debug */
 	CTL_PM=9899,		/* frv power management */
+	CTL_FRV=9898,		/* frv specific sysctls */
 };
 
 /* CTL_BUS names: */