diff --git a/[refs] b/[refs]
index 916490909b9c..d322f1d80d29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ce795065bdd2bfeebd97fa91a95918dcff7d0ec
+refs/heads/master: 040c92b8e5f080e1f5a610bf0e10c683328dce75
diff --git a/trunk/arch/ia64/include/asm/swab.h b/trunk/arch/ia64/include/asm/swab.h
index 6aa58b699eea..c89a8cb5d8a5 100644
--- a/trunk/arch/ia64/include/asm/swab.h
+++ b/trunk/arch/ia64/include/asm/swab.h
@@ -6,7 +6,7 @@
  *	David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co.
  */
 
-#include <asm/types.h>
+#include <linux/types.h>
 #include <asm/intrinsics.h>
 #include <linux/compiler.h>