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/configs/pmac32_defconfig

diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 0d8ba62..08525d6 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -218,7 +218,7 @@
 CONFIG_PM_DEBUG=y
 # CONFIG_DISABLE_CONSOLE_SUSPEND is not set
 CONFIG_PM_SYSFS_DEPRECATED=y
-CONFIG_SOFTWARE_SUSPEND=y
+CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
 CONFIG_APM_EMULATION=y
 CONFIG_SECCOMP=y