lkml.org 
[lkml]   [2017]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip:x86/urgent] x86/vmware: Remove duplicate inclusion of asm/timer.h
Commit-ID:  aa5ec3f715d576353c7d8f4f8085634bd845b73f
Gitweb: http://git.kernel.org/tip/aa5ec3f715d576353c7d8f4f8085634bd845b73f
Author: Masanari Iida <standby24x7@gmail.com>
AuthorDate: Mon, 27 Feb 2017 21:29:22 +0900
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 1 Mar 2017 10:51:40 +0100

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>

---
arch/x86/kernel/cpu/vmware.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c
index 891f4da..22403a2 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
\
 
 \ /
  Last update: 2017-03-01 11:46    [W:0.036 / U:0.928 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site