diff --git a/[refs] b/[refs]
index 07f89b9e3109..543b995266c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02df8b9385c21fdba165bd380f60eca1d3b0578b
+refs/heads/master: d8683a0cb5d09cb7f19feefa708424a84577e68f
diff --git a/trunk/include/asm-i386/apicdef.h b/trunk/include/asm-i386/apicdef.h
index c689554ad5b9..cb0a8bf530c2 100644
--- a/trunk/include/asm-i386/apicdef.h
+++ b/trunk/include/asm-i386/apicdef.h
@@ -108,11 +108,7 @@
 
 #define APIC_BASE (fix_to_virt(FIX_APIC_BASE))
 
-#ifdef CONFIG_NUMA
- #define MAX_IO_APICS 32
-#else
- #define MAX_IO_APICS 8
-#endif
+#define MAX_IO_APICS 64
 
 /*
  * the local APIC register structure, memory mapped. Not terribly well