diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 21:05:03 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 21:05:03 +0100 |
| commit | 22796b15725488002437ebbf98a22fdbe596cf89 (patch) | |
| tree | e6745c9e367e782c0b184eb941e2b86805975f88 /arch/ia64/include/asm/kvm.h | |
| parent | x86: fix "__udivdi3" [drivers/scsi/aha1542.ko] undefined (diff) | |
| parent | unconditionally include asm/types.h from linux/types.h (diff) | |
| download | linux-22796b15725488002437ebbf98a22fdbe596cf89.tar.xz linux-22796b15725488002437ebbf98a22fdbe596cf89.zip | |
Merge branch 'core/header-fixes' into x86/headers
Conflicts:
arch/x86/include/asm/setup.h
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 68aa6da807c1..116761ca462d 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> /* Architectural interrupt line count. */ |