From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L98nz-0007QM-Fg
	for qemu-devel@nongnu.org; Sat, 06 Dec 2008 20:51:31 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L98ny-0007Pp-SP
	for qemu-devel@nongnu.org; Sat, 06 Dec 2008 20:51:30 -0500
Received: from [199.232.76.173] (port=44921 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L98ny-0007Pc-HB
	for qemu-devel@nongnu.org; Sat, 06 Dec 2008 20:51:30 -0500
Received: from savannah.gnu.org ([199.232.41.3]:53073 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1L98ny-0006Tu-6X
	for qemu-devel@nongnu.org; Sat, 06 Dec 2008 20:51:30 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1L98nx-0006RJ-IF
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 01:51:29 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <balrog@savannah.gnu.org>) id 1L98nx-0006RF-9r
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 01:51:29 +0000
MIME-Version: 1.0
Errors-To: balrog
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Andrzej Zaborowski <balrogg@gmail.com>
Message-Id: <E1L98nx-0006RF-9r@cvs.savannah.gnu.org>
Date: Sun, 07 Dec 2008 01:51:29 +0000
Subject: [Qemu-devel] [5900] Remove a duplicate omap_l4_attach(),
	add one missing elsewhere.
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 5900
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5900
Author:   balrog
Date:     2008-12-07 01:51:28 +0000 (Sun, 07 Dec 2008)

Log Message:
-----------
Remove a duplicate omap_l4_attach(), add one missing elsewhere.

Modified Paths:
--------------
    trunk/hw/omap2.c
    trunk/hw/omap_dss.c

Modified: trunk/hw/omap2.c
===================================================================
--- trunk/hw/omap2.c	2008-12-07 01:49:28 UTC (rev 5899)
+++ trunk/hw/omap2.c	2008-12-07 01:51:28 UTC (rev 5900)
@@ -3898,7 +3898,6 @@
     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;
 }

Modified: trunk/hw/omap_dss.c
===================================================================
--- trunk/hw/omap_dss.c	2008-12-07 01:49:28 UTC (rev 5899)
+++ trunk/hw/omap_dss.c	2008-12-07 01:51:28 UTC (rev 5900)
@@ -1049,6 +1049,7 @@
                     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]);