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/power.h | |
| 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/power.h')
| -rw-r--r-- | kernel/power/power.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/power.h b/kernel/power/power.h index 5f24c786f8ec..9080914796f5 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h | |||
| @@ -13,7 +13,7 @@ struct swsusp_info { | |||
| 13 | 13 | ||
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | #ifdef CONFIG_SOFTWARE_SUSPEND | 16 | #ifdef CONFIG_HIBERNATION |
| 17 | /* | 17 | /* |
| 18 | * Keep some memory free so that I/O operations can succeed without paging | 18 | * Keep some memory free so that I/O operations can succeed without paging |
| 19 | * [Might this be more than 4 MB?] | 19 | * [Might this be more than 4 MB?] |