diff --git a/[refs] b/[refs]
index 3c19f6f4333a..279a298a667f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e43623b4ed1d0a1a86f0e05a2df8b9637b90ddd7
+refs/heads/master: beb6943d8df7ce9278282101af4e0f6f7b648451
diff --git a/trunk/arch/x86/include/asm/page_32.h b/trunk/arch/x86/include/asm/page_32.h
index b3f0bf79e843..da4e762406f7 100644
--- a/trunk/arch/x86/include/asm/page_32.h
+++ b/trunk/arch/x86/include/asm/page_32.h
@@ -3,6 +3,8 @@
 
 #include <asm/page_32_types.h>
 
+#ifndef __ASSEMBLY__
+
 #ifdef CONFIG_HUGETLB_PAGE
 #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
 #endif
@@ -19,8 +21,6 @@ extern unsigned long __phys_addr(unsigned long);
 #define pfn_valid(pfn)		((pfn) < max_mapnr)
 #endif /* CONFIG_FLATMEM */
 
-#ifndef __ASSEMBLY__
-
 #ifdef CONFIG_X86_USE_3DNOW
 #include <asm/mmx.h>