aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasanari Iida2017-02-27 21:29:22 +0900
committerThomas Gleixner2017-03-01 10:51:40 +0100
commitaa5ec3f715d576353c7d8f4f8085634bd845b73f (patch)
tree52289ec7b25c7f05646cfbd6d76987c580a8f633
parent73667e31a153a66da97feb1584726222504924f8 (diff)
x86/vmware: Remove duplicate inclusion of asm/timer.h
Signed-off-by: Masanari Iida <standby24x7@gmail.com> Cc: akataria@vmware.com Cc: virtualization@lists.linux-foundation.org Link: http://lkml.kernel.org/r/20170227122922.26230-1-standby24x7@gmail.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/kernel/cpu/vmware.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c
index 891f4dad7b2c..22403a28caf5 100644
--- a/arch/x86/kernel/cpu/vmware.c
+++ b/arch/x86/kernel/cpu/vmware.c
@@ -30,7 +30,6 @@
#include <asm/hypervisor.h>
#include <asm/timer.h>
#include <asm/apic.h>
-#include <asm/timer.h>
#undef pr_fmt
#define pr_fmt(fmt) "vmware: " fmt