summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-02-14 00:33:37 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-14 08:09:56 -0800
commit77f6dfb1295cae6e4cbbb90fc6da88fdf27ee95e (patch)
treee8463f6225f0e6588b8111d935164709521c3388
parentfebe1c257901c766a938007ed3710e7d54618756 (diff)
downloadblackbird-op-linux-77f6dfb1295cae6e4cbbb90fc6da88fdf27ee95e.tar.gz
blackbird-op-linux-77f6dfb1295cae6e4cbbb90fc6da88fdf27ee95e.zip
[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>
-rw-r--r--arch/frv/kernel/sysctl.c1
-rw-r--r--include/linux/sysctl.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/kernel/sysctl.c b/arch/frv/kernel/sysctl.c
index ce676803eb6f..2f4da32fba20 100644
--- 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 bb2a0e6aaa8d..113b92bbe4b9 100644
--- 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: */
OpenPOWER on IntegriCloud