diff --git a/[refs] b/[refs]
index 4a326b069245..561e3199d1de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2de548faa78c650bb20c4680ee3a225cca33a45d
+refs/heads/master: 7cff3608d2553a045b676fa81b0cf54e4f2cc5ce
diff --git a/trunk/arch/x86/include/asm/swab.h b/trunk/arch/x86/include/asm/swab.h
index 306d4178ffc9..557cd9f00661 100644
--- a/trunk/arch/x86/include/asm/swab.h
+++ b/trunk/arch/x86/include/asm/swab.h
@@ -1,7 +1,7 @@
 #ifndef _ASM_X86_SWAB_H
 #define _ASM_X86_SWAB_H
 
-#include <asm/types.h>
+#include <linux/types.h>
 #include <linux/compiler.h>
 
 static inline __attribute_const__ __u32 __arch_swab32(__u32 val)