From d64c4849b5cfa0d3d16487c684939546bbfa6377 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 3 Jun 2008 11:36:56 +0200
Subject: [PATCH] --- yaml --- r: 99312 b: refs/heads/master c:
 cf3d0cb8a10a4fd19439bb34995d9ad28854739a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c52a5f46eaf0..c82639c3366c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3294690979634ee10398bb0beadfe1d4edb881d
+refs/heads/master: cf3d0cb8a10a4fd19439bb34995d9ad28854739a
diff --git a/trunk/arch/x86/mm/discontig_32.c b/trunk/arch/x86/mm/discontig_32.c
index bb8544a7cb9d..0d28b4bff817 100644
--- a/trunk/arch/x86/mm/discontig_32.c
+++ b/trunk/arch/x86/mm/discontig_32.c
@@ -455,7 +455,7 @@ int memory_add_physaddr_to_nid(u64 addr)
 EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
 #endif
 
-#ifdef CONFIG_ACPI_NUMA
+#if defined(CONFIG_ACPI_NUMA) && !defined(CONFIG_HAVE_ARCH_PARSE_SRAT)
 /*
  * Dummy on 32-bit, for now:
  */