---

yaml --- r: 167869 b: refs/heads/master c: ed84a07 h: refs/heads/master i: 167867: 785b5de v: v3
git-mirror · Oct 27, 2009 · 733ca78 · 733ca78
1 parent efc9a80
commit 733ca78
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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