summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/lite5200_defconfig
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2007-07-29 23:24:36 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-29 16:45:38 -0700
commitb0cb1a19d05b8ea8611a9ef48a17fe417f1832e6 (patch)
tree895fe53e8dc4fc59d05b963ac079f6ff759ad0fb /arch/powerpc/configs/lite5200_defconfig
parent6c8dca5d53f95009d4fff00195bf38f277dc4366 (diff)
downloadop-kernel-dev-b0cb1a19d05b8ea8611a9ef48a17fe417f1832e6.zip
op-kernel-dev-b0cb1a19d05b8ea8611a9ef48a17fe417f1832e6.tar.gz
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/powerpc/configs/lite5200_defconfig')
-rw-r--r--arch/powerpc/configs/lite5200_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/lite5200_defconfig b/arch/powerpc/configs/lite5200_defconfig
index d12a981..9c30ca4 100644
--- a/arch/powerpc/configs/lite5200_defconfig
+++ b/arch/powerpc/configs/lite5200_defconfig
@@ -196,7 +196,7 @@ CONFIG_PM=y
# CONFIG_PM_LEGACY is not set
# CONFIG_PM_DEBUG is not set
# CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_SOFTWARE_SUSPEND is not set
+# CONFIG_HIBERNATION is not set
CONFIG_SECCOMP=y
# CONFIG_WANT_DEVICE_TREE is not set
CONFIG_ISA_DMA_API=y
OpenPOWER on IntegriCloud