summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMasanari Iida <standby24x7@gmail.com>2017-02-27 13:29:22 +0100
committerThomas Gleixner <tglx@linutronix.de>2017-03-01 10:51:40 +0100
commitaa5ec3f715d576353c7d8f4f8085634bd845b73f (patch)
tree52289ec7b25c7f05646cfbd6d76987c580a8f633 /arch
parentx86/hyperv: Hide unused label (diff)
downloadlinux-aa5ec3f715d576353c7d8f4f8085634bd845b73f.tar.xz
linux-aa5ec3f715d576353c7d8f4f8085634bd845b73f.zip
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>
Diffstat (limited to 'arch')
-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