Compile ne2000 only once

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

diff --git a/Makefile.hw b/Makefile.hw
index 648906bed2502a943b658104f7d9c053385aef71..830902bb6831486b6d8405d61e8fdf7158189813 100644 (file)
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -24,6 +24,9 @@ obj-y += wdt_i6300esb.o
 
 obj-y += msix.o
 
+# PCI network cards
+obj-y += ne2000.o
+
 # SCSI layer
 obj-y += lsi53c895a.o esp.o
 

diff --git a/Makefile.target b/Makefile.target
index 3b85ac9359b38a23a7543ae84ac407fff80c384b..e5db55bc07ee23e49f3d88fbbcd8b6476eb83d62 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -185,7 +185,6 @@ obj-y += usb-ohci.o
 
 # PCI network cards
 obj-y += eepro100.o
-obj-y += ne2000.o
 obj-y += pcnet.o
 obj-y += rtl8139.o
 obj-y += e1000.o

diff --git a/hw/ne2000.c b/hw/ne2000.c
index 82531d04ecb4e870819683ca91c9e29d43c7ce85..87f1e59d8513d054809c4a38e660907cb1c60f46 100644 (file)
--- a/hw/ne2000.c
+++ b/hw/ne2000.c
@@ -23,7 +23,6 @@
  */
 #include "hw.h"
 #include "pci.h"
-#include "pc.h"
 #include "net.h"
 #include "ne2000.h"