From 978e2796dab3b7ef1d751b42b7174b922fa5bfff Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Wed, 14 Feb 2007 00:33:36 -0800
Subject: [PATCH] --- yaml --- r: 48352 b: refs/heads/master c:
 462591b8868a18e52494e223d1a8f13311f50104 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c538e08aa4de..c2f8e951e3cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b998d4f6e559fb8eba8141263b2fddc9556391b
+refs/heads/master: 462591b8868a18e52494e223d1a8f13311f50104
diff --git a/trunk/arch/frv/kernel/pm.c b/trunk/arch/frv/kernel/pm.c
index ee677ced7b68..6b764666ad29 100644
--- a/trunk/arch/frv/kernel/pm.c
+++ b/trunk/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/trunk/include/linux/sysctl.h b/trunk/include/linux/sysctl.h
index 23a8f3c8bd7e..bb2a0e6aaa8d 100644
--- a/trunk/include/linux/sysctl.h
+++ b/trunk/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: */