aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2010-04-03 07:35:50 +0000
committerBlue Swirl <blauwirbel@gmail.com>2010-04-03 07:35:50 +0000
commit240566908f55c51f17acc85e6a6b6281a42a1183 (patch)
treeec60f3c1a01d421d11e52850415beb10c6a2315b
parent68fb89a2c07b6ad1e69a9a45f664d533f2662ec6 (diff)
sparc32: rename iommu.c to sun4m_iommu.c to make room for other IOMMUs
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--Makefile.target2
-rw-r--r--hw/sun4m_iommu.c (renamed from hw/iommu.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target
index 167fc8d4d3..9cc2bae731 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -242,7 +242,7 @@ obj-sparc-y += vga.o
obj-sparc-y += mc146818rtc.o
obj-sparc-y += cirrus_vga.o
else
-obj-sparc-y = sun4m.o lance.o tcx.o iommu.o slavio_intctl.o
+obj-sparc-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o
obj-sparc-y += slavio_timer.o slavio_misc.o sparc32_dma.o
obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o
endif
diff --git a/hw/iommu.c b/hw/sun4m_iommu.c
index 0cd2ed00e3..0cd2ed00e3 100644
--- a/hw/iommu.c
+++ b/hw/sun4m_iommu.c