commit b0cb1a19d05b8ea8611a9ef48a17fe417f1832e6
author Rafael J. Wysocki <rjw@sisk.pl> Sun Jul 29 23:24:36 2007 +0200
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Sun Jul 29 16:45:38 2007 -0700
tree 895fe53e8dc4fc59d05b963ac079f6ff759ad0fb
parent 6c8dca5d53f95009d4fff00195bf38f277dc4366

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>

arch/powerpc/Kconfig.debug

diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 5c71624..22acece 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -20,7 +20,7 @@
 
 config DEBUG_PAGEALLOC
         bool "Debug page memory allocations"
-        depends on DEBUG_KERNEL && !SOFTWARE_SUSPEND
+        depends on DEBUG_KERNEL && !HIBERNATION
         help
           Unmap pages from the kernel linear mapping after free_pages().
           This results in a large slowdown, but helps to find certain types