Merge commit 'v2.6.29' into core/header-fixes

[linux-2.6-omap-h63xx.git] / arch / ia64 / include / asm / kvm.h

diff --git a/arch/ia64/include/asm/kvm.h b/arch/ia64/include/asm/kvm.h
index bfa86b6af7cd0774d652c99d800e822284f74c23..2b0a38e847059fd18d995a01eff7ac178adda084 100644 (file)
--- a/arch/ia64/include/asm/kvm.h
+++ b/arch/ia64/include/asm/kvm.h
@@ -21,8 +21,7 @@
  *
  */
 
-#include <asm/types.h>
-
+#include <linux/types.h>
 #include <linux/ioctl.h>
 
 /* Select x86 specific features in <linux/kvm.h> */