diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2007-02-14 00:33:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 08:09:56 -0800 |
| commit | 462591b8868a18e52494e223d1a8f13311f50104 (patch) | |
| tree | 926a81f7e04cfffb5c38ab24f41533731cf1e519 | |
| parent | 4b998d4f6e559fb8eba8141263b2fddc9556391b (diff) | |
| download | linux-3.10-462591b8868a18e52494e223d1a8f13311f50104.tar.gz linux-3.10-462591b8868a18e52494e223d1a8f13311f50104.tar.bz2 linux-3.10-462591b8868a18e52494e223d1a8f13311f50104.zip | |
[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>
| -rw-r--r-- | arch/frv/kernel/pm.c | 1 | ||||
| -rw-r--r-- | 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 ee677ced7b6..6b764666ad2 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 23a8f3c8bd7..bb2a0e6aaa8 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: */ |