summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>2006-05-20 15:00:03 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-21 12:59:17 -0700
commitad8f5797302ed389476debcc51b4630f387618b9 (patch)
tree496981468883ff6f06410c205ca0007b1d1ae3dc
parentd4e9dc63dca91cd89086b5a686d7f7635c8319e5 (diff)
downloadlinux-3.10-ad8f5797302ed389476debcc51b4630f387618b9.tar.gz
linux-3.10-ad8f5797302ed389476debcc51b4630f387618b9.tar.bz2
linux-3.10-ad8f5797302ed389476debcc51b4630f387618b9.zip
[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>
-rw-r--r--arch/i386/mm/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index ae6534ad816..3df1371d452 100644
--- a/arch/i386/mm/init.c
+++ b/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)
{