From af282500e6a0b81842d711e1219f463b35aa707e Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Sat, 20 May 2006 15:00:03 -0700
Subject: [PATCH] --- yaml --- r: 26852 b: refs/heads/master c:
 ad8f5797302ed389476debcc51b4630f387618b9 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/arch/i386/mm/init.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9e6df3a6ba6e..c91e39bc84f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4e9dc63dca91cd89086b5a686d7f7635c8319e5
+refs/heads/master: ad8f5797302ed389476debcc51b4630f387618b9
diff --git a/trunk/arch/i386/mm/init.c b/trunk/arch/i386/mm/init.c
index ae6534ad8161..3df1371d4520 100644
--- a/trunk/arch/i386/mm/init.c
+++ b/trunk/arch/i386/mm/init.c
@@ -651,7 +651,7 @@ void __init mem_init(void)
  * 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)
 {