diff --git a/[refs] b/[refs]
index d9cfef67e9a2..bcf990729de2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4af3bf6b393a2cec947cd42cc10fc03f5b782484
+refs/heads/master: e42ec2418fa96f98ed8d4e6d8a572a7200156df6
diff --git a/trunk/arch/arm/include/asm/swab.h b/trunk/arch/arm/include/asm/swab.h
index 27a689be0856..ca2bf2f6d6ea 100644
--- a/trunk/arch/arm/include/asm/swab.h
+++ b/trunk/arch/arm/include/asm/swab.h
@@ -16,7 +16,7 @@
 #define __ASM_ARM_SWAB_H
 
 #include <linux/compiler.h>
-#include <asm/types.h>
+#include <linux/types.h>
 
 #if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
 #  define __SWAB_64_THRU_32__