diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 17:08:30 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 17:08:30 +0100 |
commit | 063402356280a7b262952d6351d21315336f657b (patch) | |
tree | e6fae7db15d0f4cbb9b9b7aa2b5bc176b4bf60f5 /arch/ia64/include/asm/kvm.h | |
parent | f9a36fa5413f1b2694841c410a6fdb4666e78f16 (diff) | |
parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) | |
download | kernel_goldelico_gta04-063402356280a7b262952d6351d21315336f657b.zip kernel_goldelico_gta04-063402356280a7b262952d6351d21315336f657b.tar.gz kernel_goldelico_gta04-063402356280a7b262952d6351d21315336f657b.tar.bz2 |
Merge branch 'x86/core' into x86/kconfig
Diffstat (limited to 'arch/ia64/include/asm/kvm.h')
-rw-r--r-- | arch/ia64/include/asm/kvm.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ia64/include/asm/kvm.h b/arch/ia64/include/asm/kvm.h index bfa86b6..2b0a38e 100644 --- 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> */ |