commit ad8f5797302ed389476debcc51b4630f387618b9
author KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Sat May 20 15:00:03 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sun May 21 12:59:17 2006 -0700
tree 496981468883ff6f06410c205ca0007b1d1ae3dc
parent d4e9dc63dca91cd89086b5a686d7f7635c8319e5

[PATCH] build fix: CONFIG_MEMORY_HOTPLUG=y on i386

typo in #ifdefs.  Fixes http://bugme.osdl.org/show_bug.cgi?id=6538

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/i386/mm/init.c

diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index ae6534a..3df1371 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -651,7 +651,7 @@
  * Specifically, in the case of x86, we will always add
  * memory to the highmem for now.
  */
-#ifdef CONFIG_HOTPLUG_MEMORY
+#ifdef CONFIG_MEMORY_HOTPLUG
 #ifndef CONFIG_NEED_MULTIPLE_NODES
 int add_memory(u64 start, u64 size)
 {