Compile wdt_i6300esb only once

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

diff --git a/Makefile.hw b/Makefile.hw
index 84d0cc506e52dd11a8739b03a5ec810f850f9409..11227bf873cd0ca99a40187e100cfc64060df37a 100644 (file)
--- a/Makefile.hw
+++ b/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
 

diff --git a/Makefile.target b/Makefile.target
index 28c7096b3018348d1eb1922998ad8e742a9a1844..9e70767c78ce88b87c02010c1e8239f0a74f0e6b 100644 (file)
--- a/Makefile.target
+++ b/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

diff --git a/hw/watchdog.h b/hw/watchdog.h
index 330062c85fc3deb466e8062944ae6239dd772467..8fd32c34da17ff3b314fbf74238ca3f0bc06e71f 100644 (file)
--- a/hw/watchdog.h
+++ b/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;
 

diff --git a/hw/wdt_i6300esb.c b/hw/wdt_i6300esb.c
index 9126e72524e3d8c34daae65eb2dc6481c7429b62..3abaa87cf0086d2c5a8c1bd7157ea48ff42e3b6a 100644 (file)
--- a/hw/wdt_i6300esb.c
+++ b/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*/