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 /include/asm-i386 | |
| 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 'include/asm-i386')
| -rw-r--r-- | include/asm-i386/e820.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/e820.h b/include/asm-i386/e820.h index 43114c824608..cf67dbb1db79 100644 --- a/include/asm-i386/e820.h +++ b/include/asm-i386/e820.h | |||
| @@ -47,7 +47,7 @@ extern void e820_register_memory(void); | |||
| 47 | extern void limit_regions(unsigned long long size); | 47 | extern void limit_regions(unsigned long long size); |
| 48 | extern void print_memory_map(char *who); | 48 | extern void print_memory_map(char *who); |
| 49 | 49 | ||
| 50 | #if defined(CONFIG_PM) && defined(CONFIG_SOFTWARE_SUSPEND) | 50 | #if defined(CONFIG_PM) && defined(CONFIG_HIBERNATION) |
| 51 | extern void e820_mark_nosave_regions(void); | 51 | extern void e820_mark_nosave_regions(void); |
| 52 | #else | 52 | #else |
| 53 | static inline void e820_mark_nosave_regions(void) | 53 | static inline void e820_mark_nosave_regions(void) |