summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-12 17:33:30 +0000
committerblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-12 17:33:30 +0000
commit2aa2ab3af3c5939655d5f9b715c8a9eec89a80de (patch)
tree0a1fdf77e3a9282e3b923601d376ad036a53d52e
parent8f180a430850a2a701e890cf7d527856a7fdd5e5 (diff)
downloadqemu-2aa2ab3af3c5939655d5f9b715c8a9eec89a80de.zip
Rename slavio_serial to escc
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6269 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--Makefile.target2
-rw-r--r--hw/escc.c (renamed from hw/slavio_serial.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target
index 706038555a..0e478d9970 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -693,7 +693,7 @@ OBJS+= fdc.o mc146818rtc.o serial.o m48t59.o
OBJS+= cirrus_vga.o parallel.o ptimer.o
else
OBJS+= sun4m.o tcx.o pcnet.o iommu.o m48t59.o slavio_intctl.o
-OBJS+= slavio_timer.o slavio_serial.o slavio_misc.o fdc.o sparc32_dma.o
+OBJS+= slavio_timer.o escc.o slavio_misc.o fdc.o sparc32_dma.o
OBJS+= cs4231.o ptimer.o eccmemctl.o sbi.o sun4c_intctl.o
endif
endif
diff --git a/hw/slavio_serial.c b/hw/escc.c
index 71d6368a53..71d6368a53 100644
--- a/hw/slavio_serial.c
+++ b/hw/escc.c