[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [COMMIT 9801c7b] Compile wdt_i6300esb only once
From: |
Anthony Liguori |
Subject: |
[Qemu-commits] [COMMIT 9801c7b] Compile wdt_i6300esb only once |
Date: |
Sun, 20 Sep 2009 08:36:52 -0000 |
From: Blue Swirl <address@hidden>
Signed-off-by: Blue Swirl <address@hidden>
diff --git a/Makefile.hw b/Makefile.hw
index 84d0cc5..11227bf 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 28c7096..9e70767 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 330062c..8fd32c3 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 9126e72..3abaa87 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*/
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [COMMIT 9801c7b] Compile wdt_i6300esb only once,
Anthony Liguori <=