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/power/main.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/power/main.c')
-rw-r--r-- | kernel/power/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 32147b57c3bf..cfba6987ae7d 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
@@ -292,7 +292,7 @@ static ssize_t state_show(struct kset *kset, char *buf) | |||
292 | if (pm_states[i] && valid_state(i)) | 292 | if (pm_states[i] && valid_state(i)) |
293 | s += sprintf(s,"%s ", pm_states[i]); | 293 | s += sprintf(s,"%s ", pm_states[i]); |
294 | } | 294 | } |
295 | #ifdef CONFIG_SOFTWARE_SUSPEND | 295 | #ifdef CONFIG_HIBERNATION |
296 | s += sprintf(s, "%s\n", "disk"); | 296 | s += sprintf(s, "%s\n", "disk"); |
297 | #else | 297 | #else |
298 | if (s != buf) | 298 | if (s != buf) |