diff options
| author | KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> | 2006-05-20 18:00:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-21 15:59:17 -0400 |
| commit | ad8f5797302ed389476debcc51b4630f387618b9 (patch) | |
| tree | 496981468883ff6f06410c205ca0007b1d1ae3dc /arch | |
| parent | d4e9dc63dca91cd89086b5a686d7f7635c8319e5 (diff) | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c index ae6534ad8161..3df1371d4520 100644 --- a/arch/i386/mm/init.c +++ b/arch/i386/mm/init.c | |||
| @@ -651,7 +651,7 @@ void __init mem_init(void) | |||
| 651 | * Specifically, in the case of x86, we will always add | 651 | * Specifically, in the case of x86, we will always add |
| 652 | * memory to the highmem for now. | 652 | * memory to the highmem for now. |
| 653 | */ | 653 | */ |
| 654 | #ifdef CONFIG_HOTPLUG_MEMORY | 654 | #ifdef CONFIG_MEMORY_HOTPLUG |
| 655 | #ifndef CONFIG_NEED_MULTIPLE_NODES | 655 | #ifndef CONFIG_NEED_MULTIPLE_NODES |
| 656 | int add_memory(u64 start, u64 size) | 656 | int add_memory(u64 start, u64 size) |
| 657 | { | 657 | { |