From 9801c7b436cb86456db6c34d099829d2e8796440 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sun, 20 Sep 2009 08:02:28 +0000 Subject: [PATCH] Compile wdt_i6300esb only once Signed-off-by: Blue Swirl --- Makefile.hw | 3 +++ Makefile.target | 3 --- hw/watchdog.h | 2 ++ hw/wdt_i6300esb.c | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.hw b/Makefile.hw index 84d0cc506..11227bf87 100644 --- 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 28c7096b3..9e70767c7 100644 --- 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 330062c85..8fd32c34d 100644 --- 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 9126e7252..3abaa87cf 100644 --- 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*/ -- 2.39.5