diff --git a/[refs] b/[refs]
index cb8c067e1627..916490909b9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ecbb7fcfd20803bdd403de0c9c514da7d6c8843
+refs/heads/master: 6ce795065bdd2bfeebd97fa91a95918dcff7d0ec
diff --git a/trunk/arch/ia64/include/asm/kvm.h b/trunk/arch/ia64/include/asm/kvm.h
index 68aa6da807c1..116761ca462d 100644
--- a/trunk/arch/ia64/include/asm/kvm.h
+++ b/trunk/arch/ia64/include/asm/kvm.h
@@ -21,8 +21,7 @@
  *
  */
 
-#include <asm/types.h>
-
+#include <linux/types.h>
 #include <linux/ioctl.h>
 
 /* Architectural interrupt line count. */