diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-07-29 17:24:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-29 19:45:38 -0400 |
commit | b0cb1a19d05b8ea8611a9ef48a17fe417f1832e6 (patch) | |
tree | 895fe53e8dc4fc59d05b963ac079f6ff759ad0fb /kernel/sys.c | |
parent | 6c8dca5d53f95009d4fff00195bf38f277dc4366 (diff) |
Replace CONFIG_SOFTWARE_SUSPEND with CONFIG_HIBERNATION
Replace CONFIG_SOFTWARE_SUSPEND with CONFIG_HIBERNATION to avoid
confusion (among other things, with CONFIG_SUSPEND introduced in the
next patch).
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/sys.c')
-rw-r--r-- | kernel/sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 14f8adcfffd9..449b81b98b3d 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -954,7 +954,7 @@ asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd, void __user | |||
954 | unlock_kernel(); | 954 | unlock_kernel(); |
955 | return -EINVAL; | 955 | return -EINVAL; |
956 | 956 | ||
957 | #ifdef CONFIG_SOFTWARE_SUSPEND | 957 | #ifdef CONFIG_HIBERNATION |
958 | case LINUX_REBOOT_CMD_SW_SUSPEND: | 958 | case LINUX_REBOOT_CMD_SW_SUSPEND: |
959 | { | 959 | { |
960 | int ret = hibernate(); | 960 | int ret = hibernate(); |