From: Eric W. Biederman <ebiederm@xmission.com>
Date: Wed, 14 Feb 2007 08:33:36 +0000 (-0800)
Subject: [PATCH] sysctl: move CTL_PM into sysctl.h where it belongs
X-Git-Tag: v2.6.21-rc1~227
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=462591b8868a18e52494e223d1a8f13311f50104;p=linux-2.6

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

Signed-off-by: Eric W. Biederman <ebiederm@xmission.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/pm.c b/arch/frv/kernel/pm.c
index ee677ced7b..6b764666ad 100644
--- a/arch/frv/kernel/pm.c
+++ b/arch/frv/kernel/pm.c
@@ -125,7 +125,6 @@ unsigned long sleep_phys_sp(void *sp)
  * Use a temporary sysctl number. Horrid, but will be cleaned up in 2.6
  * when all the PM interfaces exist nicely.
  */
-#define CTL_PM 9899
 #define CTL_PM_SUSPEND 1
 #define CTL_PM_CMODE 2
 #define CTL_PM_P0 4
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 23a8f3c8bd..bb2a0e6aaa 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -71,6 +71,7 @@ enum
 	CTL_ABI=9,		/* Binary emulation */
 	CTL_CPU=10,		/* CPU stuff (speed scaling, etc) */
 	CTL_SUNRPC=7249,	/* sunrpc debug */
+	CTL_PM=9899,		/* frv power management */
 };
 
 /* CTL_BUS names: */