summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-10-28 11:15:35 +0000
committerMark McLoughlin <markmc@redhat.com>2009-10-28 11:15:35 +0000
commit0c42576b3e16c50c601bb4f4a9945d6568c6f455 (patch)
treef339b2a6dad122cc9af4a983b313a9f1e31a817b /Makefile.target
parentpcnet: intermediate merge fixup (diff)
parentrtl8139: use qdev properties for configuration. (diff)
downloadqemu-kvm-0c42576b3e16c50c601bb4f4a9945d6568c6f455.tar.gz
qemu-kvm-0c42576b3e16c50c601bb4f4a9945d6568c6f455.tar.bz2
qemu-kvm-0c42576b3e16c50c601bb4f4a9945d6568c6f455.zip
Merge commit '254111ecc80501a7d5c0e82f78bfa5ca8749ae20' into upstream-merge
* commit '254111ecc80501a7d5c0e82f78bfa5ca8749ae20': rtl8139: use qdev properties for configuration. pcnet: split away lance.c (sparc32 code). Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Diffstat (limited to 'Makefile.target')
-rw-r--r--Makefile.target2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target
index c21a24a27..b607f7105 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -289,7 +289,7 @@ obj-sparc-y += vga.o vga-pci.o
obj-sparc-y += fdc.o mc146818rtc.o serial.o
obj-sparc-y += cirrus_vga.o parallel.o
else
-obj-sparc-y = sun4m.o tcx.o iommu.o slavio_intctl.o
+obj-sparc-y = sun4m.o lance.o tcx.o iommu.o slavio_intctl.o
obj-sparc-y += slavio_timer.o slavio_misc.o fdc.o sparc32_dma.o
obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o
endif