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/sparc64 | |
| 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/sparc64')
| -rw-r--r-- | arch/sparc64/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/Kconfig.debug b/arch/sparc64/Kconfig.debug index 1f130f3b6c24..a5faa3683bd6 100644 --- a/arch/sparc64/Kconfig.debug +++ b/arch/sparc64/Kconfig.debug | |||
| @@ -29,7 +29,7 @@ config DEBUG_BOOTMEM | |||
| 29 | 29 | ||
| 30 | config DEBUG_PAGEALLOC | 30 | config DEBUG_PAGEALLOC |
| 31 | bool "Debug page memory allocations" | 31 | bool "Debug page memory allocations" |
| 32 | depends on DEBUG_KERNEL && !SOFTWARE_SUSPEND | 32 | depends on DEBUG_KERNEL && !HIBERNATION |
| 33 | help | 33 | help |
| 34 | Unmap pages from the kernel linear mapping after free_pages(). | 34 | Unmap pages from the kernel linear mapping after free_pages(). |
| 35 | This results in a large slowdown, but helps to find certain types | 35 | This results in a large slowdown, but helps to find certain types |