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/ppc/configs/ev64360_defconfig

diff --git a/arch/ppc/configs/ev64360_defconfig b/arch/ppc/configs/ev64360_defconfig
index d471e57..f297c4b 100644
--- a/arch/ppc/configs/ev64360_defconfig
+++ b/arch/ppc/configs/ev64360_defconfig
@@ -142,7 +142,7 @@
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="console=ttyMM0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2"
 # CONFIG_PM is not set
-# CONFIG_SOFTWARE_SUSPEND is not set
+# CONFIG_HIBERNATION is not set
 CONFIG_SECCOMP=y
 CONFIG_ISA_DMA_API=y