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>
This commit is contained in:

committed by
Linus Torvalds

parent
6c8dca5d53
commit
b0cb1a19d0
@@ -72,8 +72,8 @@ config PM_TRACE
|
||||
CAUTION: this option will cause your machine's real-time clock to be
|
||||
set to an invalid time after a resume.
|
||||
|
||||
config SOFTWARE_SUSPEND
|
||||
bool "Software Suspend (Hibernation)"
|
||||
config HIBERNATION
|
||||
bool "Hibernation"
|
||||
depends on PM && SWAP && (((X86 || PPC64_SWSUSP) && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP))
|
||||
---help---
|
||||
Enable the suspend to disk (STD) functionality, which is usually
|
||||
@@ -112,7 +112,7 @@ config SOFTWARE_SUSPEND
|
||||
|
||||
config PM_STD_PARTITION
|
||||
string "Default resume partition"
|
||||
depends on SOFTWARE_SUSPEND
|
||||
depends on HIBERNATION
|
||||
default ""
|
||||
---help---
|
||||
The default resume partition is the partition that the suspend-
|
||||
|
Reference in New Issue
Block a user