diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
| commit | f58899bb0224741eb0409ada67ecafe90ba137ef (patch) | |
| tree | 78284f77021e830b32e77071dd2ef4e5ccdaa289 /include/asm-x86 | |
| parent | a2bd7274b47124d2fc4dfdb8c0591f545ba749dd (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'include/asm-x86')
| -rw-r--r-- | include/asm-x86/xen/hypervisor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-x86/xen/hypervisor.h b/include/asm-x86/xen/hypervisor.h index 8e15dd28c91f..04ee0610014a 100644 --- a/include/asm-x86/xen/hypervisor.h +++ b/include/asm-x86/xen/hypervisor.h | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | 35 | ||
| 36 | #include <linux/types.h> | 36 | #include <linux/types.h> |
| 37 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
| 38 | #include <linux/version.h> | ||
| 39 | 38 | ||
| 40 | #include <xen/interface/xen.h> | 39 | #include <xen/interface/xen.h> |
| 41 | #include <xen/interface/version.h> | 40 | #include <xen/interface/version.h> |