From: Masanari Iida <standby24x7@gmail.com>
Date: Mon, 27 Feb 2017 12:29:22 +0000 (+0900)
Subject: x86/vmware: Remove duplicate inclusion of asm/timer.h
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=aa5ec3f715d576353c7d8f4f8085634bd845b73f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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