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/ev64360_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/ev64360_defconfig')
| -rw-r--r-- | arch/ppc/configs/ev64360_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/configs/ev64360_defconfig b/arch/ppc/configs/ev64360_defconfig index d471e578dcb5..f297c4bb632b 100644 --- a/arch/ppc/configs/ev64360_defconfig +++ b/arch/ppc/configs/ev64360_defconfig | |||
| @@ -142,7 +142,7 @@ CONFIG_BINFMT_MISC=y | |||
| 142 | CONFIG_CMDLINE_BOOL=y | 142 | CONFIG_CMDLINE_BOOL=y |
| 143 | CONFIG_CMDLINE="console=ttyMM0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2" | 143 | CONFIG_CMDLINE="console=ttyMM0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2" |
| 144 | # CONFIG_PM is not set | 144 | # CONFIG_PM is not set |
| 145 | # CONFIG_SOFTWARE_SUSPEND is not set | 145 | # CONFIG_HIBERNATION is not set |
| 146 | CONFIG_SECCOMP=y | 146 | CONFIG_SECCOMP=y |
| 147 | CONFIG_ISA_DMA_API=y | 147 | CONFIG_ISA_DMA_API=y |
| 148 | 148 | ||