From 844c3b0e0e605bdee1c10170636af776c8f5f994 Mon Sep 17 00:00:00 2001 From: Yasunori Goto Date: Tue, 27 Jun 2006 02:53:37 -0700 Subject: [PATCH] --- yaml --- r: 30729 b: refs/heads/master c: 1f04bbd2d396a701c5af2e5b92bad896c2550c16 h: refs/heads/master i: 30727: 04ad84e298788c65fc910f5baba35e7b03fb39dd v: v3 --- [refs] | 2 +- trunk/mm/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 07b5adbb8d88..f9b6102878d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2842f11419704f8707fffc82e10d2263427fc130 +refs/heads/master: 1f04bbd2d396a701c5af2e5b92bad896c2550c16 diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig index 66e65ab39426..e76c023eb0bb 100644 --- a/trunk/mm/Kconfig +++ b/trunk/mm/Kconfig @@ -116,6 +116,7 @@ config SPARSEMEM_EXTREME config MEMORY_HOTPLUG bool "Allow for memory hot-add" depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND + depends on (IA64 || X86 || PPC64) comment "Memory hotplug is currently incompatible with Software Suspend" depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND