diff --git a/[refs] b/[refs]
index da0c5496514a..3df695b0a989 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 999721ca6d0c2540341acb73ac9048cbd6b05d3a
+refs/heads/master: cef3767852a9b1a7ff4a8dfe0969e2d32eb728df
diff --git a/trunk/arch/x86/include/asm/kvm.h b/trunk/arch/x86/include/asm/kvm.h
index b95162af0bf6..d2e3bf3608af 100644
--- a/trunk/arch/x86/include/asm/kvm.h
+++ b/trunk/arch/x86/include/asm/kvm.h
@@ -6,7 +6,7 @@
  *
  */
 
-#include <asm/types.h>
+#include <linux/types.h>
 #include <linux/ioctl.h>
 
 /* Architectural interrupt line count. */