diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-07-29 21:24:36 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-29 23:45:38 (GMT) |
commit | b0cb1a19d05b8ea8611a9ef48a17fe417f1832e6 (patch) | |
tree | 895fe53e8dc4fc59d05b963ac079f6ff759ad0fb /arch/ppc/configs/prep_defconfig | |
parent | 6c8dca5d53f95009d4fff00195bf38f277dc4366 (diff) | |
download | linux-fsl-qoriq-b0cb1a19d05b8ea8611a9ef48a17fe417f1832e6.tar.xz |
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/ppc/configs/prep_defconfig')
-rw-r--r-- | arch/ppc/configs/prep_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/configs/prep_defconfig b/arch/ppc/configs/prep_defconfig index 0aa3331..b7cee2d 100644 --- a/arch/ppc/configs/prep_defconfig +++ b/arch/ppc/configs/prep_defconfig @@ -166,7 +166,7 @@ CONFIG_PROC_PREPRESIDUAL=y CONFIG_PM=y # CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set -CONFIG_SOFTWARE_SUSPEND=y +CONFIG_HIBERNATION=y CONFIG_PM_STD_PARTITION="" # CONFIG_SECCOMP is not set CONFIG_ISA_DMA_API=y |