diff options
| -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 ee677ced7b68..6b764666ad29 100644 --- a/arch/frv/kernel/pm.c +++ b/arch/frv/kernel/pm.c | |||
| @@ -125,7 +125,6 @@ unsigned long sleep_phys_sp(void *sp) | |||
| 125 | * Use a temporary sysctl number. Horrid, but will be cleaned up in 2.6 | 125 | * Use a temporary sysctl number. Horrid, but will be cleaned up in 2.6 |
| 126 | * when all the PM interfaces exist nicely. | 126 | * when all the PM interfaces exist nicely. |
| 127 | */ | 127 | */ |
| 128 | #define CTL_PM 9899 | ||
| 129 | #define CTL_PM_SUSPEND 1 | 128 | #define CTL_PM_SUSPEND 1 |
| 130 | #define CTL_PM_CMODE 2 | 129 | #define CTL_PM_CMODE 2 |
| 131 | #define CTL_PM_P0 4 | 130 | #define CTL_PM_P0 4 |
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 23a8f3c8bd7e..bb2a0e6aaa8d 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
| @@ -71,6 +71,7 @@ enum | |||
| 71 | CTL_ABI=9, /* Binary emulation */ | 71 | CTL_ABI=9, /* Binary emulation */ |
| 72 | CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ | 72 | CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ |
| 73 | CTL_SUNRPC=7249, /* sunrpc debug */ | 73 | CTL_SUNRPC=7249, /* sunrpc debug */ |
| 74 | CTL_PM=9899, /* frv power management */ | ||
| 74 | }; | 75 | }; |
| 75 | 76 | ||
| 76 | /* CTL_BUS names: */ | 77 | /* CTL_BUS names: */ |