projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
73667e3
)
x86/vmware: Remove duplicate inclusion of asm/timer.h
author
Masanari Iida
<standby24x7@gmail.com>
Mon, 27 Feb 2017 12:29:22 +0000
(21:29 +0900)
committer
Thomas Gleixner
<tglx@linutronix.de>
Wed, 1 Mar 2017 09:51:40 +0000
(10:51 +0100)
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>
arch/x86/kernel/cpu/vmware.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/cpu/vmware.c
b/arch/x86/kernel/cpu/vmware.c
index 891f4dad7b2c49c81518e15ecee61bc8d4694ff2..22403a28caf52226163ae96779c3f2a79fc3431d 100644
(file)
--- 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