diff --git a/[refs] b/[refs]
index 8289a9e174b2..b3391793a66f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48109870bab7e66f30f933cd218258368024cd9f
+refs/heads/master: 1ff8f739c7cc4eaa89b6ba986494f458ff7bdbef
diff --git a/trunk/arch/xtensa/include/asm/swab.h b/trunk/arch/xtensa/include/asm/swab.h
index f50b697eb601..226a39162310 100644
--- a/trunk/arch/xtensa/include/asm/swab.h
+++ b/trunk/arch/xtensa/include/asm/swab.h
@@ -11,7 +11,7 @@
 #ifndef _XTENSA_SWAB_H
 #define _XTENSA_SWAB_H
 
-#include <asm/types.h>
+#include <linux/types.h>
 #include <linux/compiler.h>
 
 #define __SWAB_64_THRU_32__