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/ppc/configs/prep_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/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 0aa333178b2a..b7cee2d71405 100644 --- a/arch/ppc/configs/prep_defconfig +++ b/arch/ppc/configs/prep_defconfig | |||
| @@ -166,7 +166,7 @@ CONFIG_PROC_PREPRESIDUAL=y | |||
| 166 | CONFIG_PM=y | 166 | CONFIG_PM=y |
| 167 | # CONFIG_PM_LEGACY is not set | 167 | # CONFIG_PM_LEGACY is not set |
| 168 | # CONFIG_PM_DEBUG is not set | 168 | # CONFIG_PM_DEBUG is not set |
| 169 | CONFIG_SOFTWARE_SUSPEND=y | 169 | CONFIG_HIBERNATION=y |
| 170 | CONFIG_PM_STD_PARTITION="" | 170 | CONFIG_PM_STD_PARTITION="" |
| 171 | # CONFIG_SECCOMP is not set | 171 | # CONFIG_SECCOMP is not set |
| 172 | CONFIG_ISA_DMA_API=y | 172 | CONFIG_ISA_DMA_API=y |