---

yaml --- r: 99312 b: refs/heads/master c: cf3d0cb h: refs/heads/master v: v3
git-mirror · Jun 3, 2008 · d64c484 · d64c484
1 parent 3537109
commit d64c484
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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:
  */