From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ebiederm.dsl.xmission.com (ebiederm.dsl.xmission.com [166.70.28.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTP id E1824DE3E7 for ; Wed, 17 Jan 2007 04:18:48 +1100 (EST) From: "Eric W. Biederman" To: " Subject: [PATCH 21/59] sysctl: Move CTL_PM into sysctl.h where it belongs. Date: Tue, 16 Jan 2007 09:39:26 -0700 Message-Id: <11689656383210-git-send-email-ebiederm@xmission.com> In-Reply-To: References: Cc: linux-mips@linux-mips.org, linux-parport@lists.infradead.org, heiko.carstens@de.ibm.com, ak@suse.de, linuxppc-dev@ozlabs.org, paulus@samba.org, aharkes@cs.cmu.edu, schwidefsky@de.ibm.com, tim@cyberelk.net, rtc-linux@googlegroups.com, linux-scsi@vger.kernel.org, kurt.hackel@oracle.com, coda@cs.cmu.edu, vojtech@suse.cz, linuxsh-shmedia-dev@lists.sourceforge.net, James.Bottomley@SteelEye.com, clemens@ladisch.de, xfs@oss.sgi.com, xfs-masters@oss.sgi.com, andrea@suse.de, openipmi-developer@lists.sourceforge.net, linux-390@vm.marist.edu, codalist@TELEMANN.coda.cs.cmu.edu, a.zummo@towertech.it, tony.luck@intel.com, linux-ntfs-dev@lists.sourceforge.net, netdev@vger.kernel.org, aia21@cantab.net, linux-kernel@vger.kernel.org, ralf@linux-mips.org, lethal@linux-sh.org, "Eric W. Biederman" , containers@lists.osdl.org, linux390@de.ibm.com, philb@gnu.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Eric W. Biederman - unquoted Signed-off-by: Eric W. Biederman --- arch/frv/kernel/pm.c | 1 - include/linux/sysctl.h | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c index ee677ce..6b76466 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 54a9cf5..e7c40b6 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: */ -- 1.4.4.1.g278f