diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 13:02:23 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 13:02:23 +0100 |
| commit | 8e818179eb9e8f9e44d8410dd2a25077d026a08e (patch) | |
| tree | 7d08afd30c95c04129c20693d974a18799caeb5a /arch/x86/kernel/kvmclock.c | |
| parent | 742bd95ba96e19b3f7196c3a0834ebc17c8ba006 (diff) | |
| parent | ecc25fbd6b9e07b33895c61ddf84006b00f55d99 (diff) | |
Merge branch 'x86/core' into perfcounters/core
Conflicts:
arch/x86/kernel/apic/apic.c
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/kvmclock.c')
| -rw-r--r-- | arch/x86/kernel/kvmclock.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 652fce6d2cc..137f2e8132d 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -19,7 +19,6 @@ #include <linux/clocksource.h> #include <linux/kvm_para.h> #include <asm/pvclock.h> -#include <asm/arch_hooks.h> #include <asm/msr.h> #include <asm/apic.h> #include <linux/percpu.h> |