summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-12-07 01:51:28 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-12-07 01:51:28 +0000
commit9e7d11ff34f2213ba4e7ef35720f058b9a1ec8c3 (patch)
treebbe59cd562a1f0433a41a22772315815e57a431f /hw
parented005253181b0dae5911e1378f274ed80a20d0be (diff)
downloadhqemu-9e7d11ff34f2213ba4e7ef35720f058b9a1ec8c3.zip
hqemu-9e7d11ff34f2213ba4e7ef35720f058b9a1ec8c3.tar.gz
Remove a duplicate omap_l4_attach(), add one missing elsewhere.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5900 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/omap2.c1
-rw-r--r--hw/omap_dss.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/hw/omap2.c b/hw/omap2.c
index 58debaf..01b7d52 100644
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -3898,7 +3898,6 @@ struct omap_sysctl_s *omap_sysctl_init(struct omap_target_agent_s *ta,
iomemtype = l4_register_io_memory(0, omap_sysctl_readfn,
omap_sysctl_writefn, s);
omap_l4_attach(ta, 0, iomemtype);
- omap_l4_attach(ta, 0, iomemtype);
return s;
}
diff --git a/hw/omap_dss.c b/hw/omap_dss.c
index 87c91aa..8fcb19c 100644
--- a/hw/omap_dss.c
+++ b/hw/omap_dss.c
@@ -1049,6 +1049,7 @@ struct omap_dss_s *omap_dss_init(struct omap_target_agent_s *ta,
omap_im3_writefn, s);
omap_l4_attach(ta, 0, iomemtype[0]);
omap_l4_attach(ta, 1, iomemtype[1]);
+ omap_l4_attach(ta, 2, iomemtype[2]);
omap_l4_attach(ta, 3, iomemtype[3]);
cpu_register_physical_memory(l3_base, 0x1000, iomemtype[4]);
OpenPOWER on IntegriCloud