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 /arch/i386/mm/init.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 'arch/i386/mm/init.c')
| -rw-r--r-- | arch/i386/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c index 4c4809f13cb..730a5b177b1 100644 --- a/arch/i386/mm/init.c +++ b/arch/i386/mm/init.c | |||
| @@ -432,7 +432,7 @@ static void __init pagetable_init (void) | |||
| 432 | paravirt_pagetable_setup_done(pgd_base); | 432 | paravirt_pagetable_setup_done(pgd_base); |
| 433 | } | 433 | } |
| 434 | 434 | ||
| 435 | #if defined(CONFIG_SOFTWARE_SUSPEND) || defined(CONFIG_ACPI) | 435 | #if defined(CONFIG_HIBERNATION) || defined(CONFIG_ACPI) |
| 436 | /* | 436 | /* |
| 437 | * Swap suspend & friends need this for resume because things like the intel-agp | 437 | * Swap suspend & friends need this for resume because things like the intel-agp |
| 438 | * driver might have split up a kernel 4MB mapping. | 438 | * driver might have split up a kernel 4MB mapping. |