diff options
Diffstat (limited to 'mm/Kconfig')
| -rw-r--r-- | mm/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index e3644b0062b1..8f5b45615f7b 100644 --- a/mm/Kconfig +++ b/mm/Kconfig | |||
| @@ -115,7 +115,8 @@ config SPARSEMEM_EXTREME | |||
| 115 | # eventually, we can have this option just 'select SPARSEMEM' | 115 | # eventually, we can have this option just 'select SPARSEMEM' |
| 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 && HOTPLUG && !SOFTWARE_SUSPEND | 118 | depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG |
| 119 | depends on (IA64 || X86 || PPC64) | ||
| 119 | 120 | ||
| 120 | comment "Memory hotplug is currently incompatible with Software Suspend" | 121 | comment "Memory hotplug is currently incompatible with Software Suspend" |
| 121 | depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND | 122 | depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND |