Merge remote-tracking branch 'remotes/stsquad/tags/pull-travis-20160621-1' into staging

[qemu.git] / hw / timer / digic-timer.c

diff --git a/hw/timer/digic-timer.c b/hw/timer/digic-timer.c
index 1fde22c67f3f22aecb7be8c1f44fe715032db5c0..0f21faf876182900926b7e047565caf23163fd2b 100644 (file)
--- a/hw/timer/digic-timer.c
+++ b/hw/timer/digic-timer.c
@@ -26,9 +26,11 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/ptimer.h"
 #include "qemu/main-loop.h"
+#include "qemu/log.h"
 
 #include "hw/timer/digic-timer.h"
 
@@ -36,7 +38,6 @@ static const VMStateDescription vmstate_digic_timer = {
     .name = "digic.timer",
     .version_id = 1,
     .minimum_version_id = 1,
-    .minimum_version_id_old = 1,
     .fields = (VMStateField[]) {
         VMSTATE_PTIMER(ptimer, DigicTimerState),
         VMSTATE_UINT32(control, DigicTimerState),