diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-07-29 17:24:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-29 19:45:38 -0400 |
| commit | b0cb1a19d05b8ea8611a9ef48a17fe417f1832e6 (patch) | |
| tree | 895fe53e8dc4fc59d05b963ac079f6ff759ad0fb /arch/powerpc/configs/pmac32_defconfig | |
| parent | 6c8dca5d53f95009d4fff00195bf38f277dc4366 (diff) | |
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/pmac32_defconfig')
| -rw-r--r-- | arch/powerpc/configs/pmac32_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index 0d8ba623e29a..08525d6fb1f1 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_defconfig | |||
| @@ -218,7 +218,7 @@ CONFIG_PM=y | |||
| 218 | CONFIG_PM_DEBUG=y | 218 | CONFIG_PM_DEBUG=y |
| 219 | # CONFIG_DISABLE_CONSOLE_SUSPEND is not set | 219 | # CONFIG_DISABLE_CONSOLE_SUSPEND is not set |
| 220 | CONFIG_PM_SYSFS_DEPRECATED=y | 220 | CONFIG_PM_SYSFS_DEPRECATED=y |
| 221 | CONFIG_SOFTWARE_SUSPEND=y | 221 | CONFIG_HIBERNATION=y |
| 222 | CONFIG_PM_STD_PARTITION="" | 222 | CONFIG_PM_STD_PARTITION="" |
| 223 | CONFIG_APM_EMULATION=y | 223 | CONFIG_APM_EMULATION=y |
| 224 | CONFIG_SECCOMP=y | 224 | CONFIG_SECCOMP=y |