Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 462591b8868a18e52494e223d1a8f13311f50104

Authored by Eric W. Biederman
Committed by Linus Torvalds
1 parent 4b998d4f6e

[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>

Showing 2 changed files with 1 additions and 1 deletions Side-by-side Diff

arch/frv/kernel/pm.c
Diff comments   View file @ 462591b
... ... @@ -125,7 +125,6 @@
125 125 * Use a temporary sysctl number. Horrid, but will be cleaned up in 2.6
126 126 * when all the PM interfaces exist nicely.
127 127 */
128   -#define CTL_PM 9899
129 128 #define CTL_PM_SUSPEND 1
130 129 #define CTL_PM_CMODE 2
131 130 #define CTL_PM_P0 4
include/linux/sysctl.h
Diff comments   View file @ 462591b
... ... @@ -71,6 +71,7 @@
71 71 CTL_ABI=9, /* Binary emulation */
72 72 CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
73 73 CTL_SUNRPC=7249, /* sunrpc debug */
  74 + CTL_PM=9899, /* frv power management */
74 75 };
75 76  
76 77 /* CTL_BUS names: */