Compile wdt_i6300esb only once

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

Makefile.hw

@@ -18,6 +18,9 @@ obj-y += nand.o ecc.o
 
 obj-y += m48t59.o escc.o
 
+# PCI watchdog devices
+obj-y += wdt_i6300esb.o
+
 # SCSI layer
 obj-y += lsi53c895a.o esp.o
 

Makefile.target

@@ -190,9 +190,6 @@ obj-y += pcnet.o
 obj-y += rtl8139.o
 obj-y += e1000.o
 
-# PCI watchdog devices
-obj-y += wdt_i6300esb.o
-
 # Hardware support
 obj-i386-y = ide/core.o ide/qdev.o ide/isa.o ide/pci.o
 obj-i386-y += pckbd.o $(sound-obj-y) dma.o

hw/watchdog.h

@@ -22,6 +22,8 @@
 #ifndef QEMU_WATCHDOG_H
 #define QEMU_WATCHDOG_H
 
+#include "qemu-queue.h"
+
 struct WatchdogTimerModel {
     QLIST_ENTRY(WatchdogTimerModel) entry;
 

hw/wdt_i6300esb.c

@@ -25,7 +25,6 @@
 #include "qemu-timer.h"
 #include "watchdog.h"
 #include "hw.h"
-#include "pc.h"
 #include "pci.h"
 
 /*#define I6300ESB_DEBUG 1*/