Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180116' into staging

[qemu.git] / hw / timer / grlib_gptimer.c

diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c
index 712d1aece5a0ba6961357e9551378c363b8c31b7..4ed96e970a78865923c66ee4cabbd7dc01e01cda 100644 (file)
--- a/hw/timer/grlib_gptimer.c
+++ b/hw/timer/grlib_gptimer.c
@@ -26,7 +26,6 @@
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
-#include "qemu/timer.h"
 #include "qemu/main-loop.h"
 
 #include "trace.h"