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 /mm/Kconfig | |
| 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 'mm/Kconfig')
| -rw-r--r-- | mm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index 86187221e78f..e24d348083c3 100644 --- a/mm/Kconfig +++ b/mm/Kconfig | |||
| @@ -116,11 +116,11 @@ config SPARSEMEM_EXTREME | |||
| 116 | config MEMORY_HOTPLUG | 116 | config MEMORY_HOTPLUG |
| 117 | bool "Allow for memory hot-add" | 117 | bool "Allow for memory hot-add" |
| 118 | depends on SPARSEMEM || X86_64_ACPI_NUMA | 118 | depends on SPARSEMEM || X86_64_ACPI_NUMA |
| 119 | depends on HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG | 119 | depends on HOTPLUG && !HIBERNATION && ARCH_ENABLE_MEMORY_HOTPLUG |
| 120 | depends on (IA64 || X86 || PPC64 || SUPERH) | 120 | depends on (IA64 || X86 || PPC64 || SUPERH) |
| 121 | 121 | ||
| 122 | comment "Memory hotplug is currently incompatible with Software Suspend" | 122 | comment "Memory hotplug is currently incompatible with Software Suspend" |
| 123 | depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND | 123 | depends on SPARSEMEM && HOTPLUG && HIBERNATION |
| 124 | 124 | ||
| 125 | config MEMORY_HOTPLUG_SPARSE | 125 | config MEMORY_HOTPLUG_SPARSE |
| 126 | def_bool y | 126 | def_bool y |