From 733ca78a59b46d689651e374d67d2615d91fa277 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Fri, 16 Oct 2009 07:21:36 +0000 Subject: [PATCH] --- yaml --- r: 167869 b: refs/heads/master c: ed84a07a124bf3b1aab2fd7fdb6e9534838087ac h: refs/heads/master i: 167867: 785b5de4871a6f158bb08c1cb58885b91aebc78a v: v3 --- [refs] | 2 +- trunk/mm/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7de447630b85..a6e98060671a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0cd9ad73b8d181737005ff4e506b9b6bd043f4dd +refs/heads/master: ed84a07a124bf3b1aab2fd7fdb6e9534838087ac diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig index 57963c6063d1..7ca3777bdede 100644 --- a/trunk/mm/Kconfig +++ b/trunk/mm/Kconfig @@ -129,7 +129,7 @@ config MEMORY_HOTPLUG bool "Allow for memory hot-add" depends on SPARSEMEM || X86_64_ACPI_NUMA depends on HOTPLUG && !(HIBERNATION && !S390) && ARCH_ENABLE_MEMORY_HOTPLUG - depends on (IA64 || X86 || PPC64 || SUPERH || S390) + depends on (IA64 || X86 || PPC_BOOK3S_64 || SUPERH || S390) comment "Memory hotplug is currently incompatible with Software Suspend" depends on SPARSEMEM && HOTPLUG && HIBERNATION && !S390