[PATCH] sysctl: move CTL_FRV into sysctl.h where it belongs

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/frv/kernel/sysctl.c b/arch/frv/kernel/sysctl.c
index ce676803eb6f59a03e8ee36780ac009fac4cc63b..2f4da32fba20011eafefdeb84d8d6f25b248fcdb 100644 (file)
--- a/arch/frv/kernel/sysctl.c
+++ b/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/include/linux/sysctl.h b/include/linux/sysctl.h
index bb2a0e6aaa8d504f7ab69bd037dd4a8781d8c842..113b92bbe4b90cc2d70e03a52eb44e631c8d1956 100644 (file)
--- a/include/linux/sysctl.h
+++ b/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: */