diff --git a/[refs] b/[refs]
index 100aaa8539ca..cfce27f8f2a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d673a5a4775d3dc565b6668ed75fd2db2ede624
+refs/heads/master: 4e54bdaa9cf55d7e74409ea288b705c144b2627e
diff --git a/trunk/include/asm-i386/mmzone.h b/trunk/include/asm-i386/mmzone.h
index e33e9f9e4c66..22cb07cc8f32 100644
--- a/trunk/include/asm-i386/mmzone.h
+++ b/trunk/include/asm-i386/mmzone.h
@@ -14,7 +14,7 @@ extern struct pglist_data *node_data[];
 
 #ifdef CONFIG_X86_NUMAQ
 	#include <asm/numaq.h>
-#else	/* summit or generic arch */
+#elif defined(CONFIG_ACPI_SRAT)/* summit or generic arch */
 	#include <asm/srat.h>
 #endif