From owner-p4-projects@FreeBSD.ORG  Tue Nov 21 17:24:34 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F090016B6A8; Tue, 21 Nov 2006 17:23:07 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A8ED816B329
	for <perforce@freebsd.org>; Tue, 21 Nov 2006 17:21:48 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7C050440F4
	for <perforce@freebsd.org>; Tue, 21 Nov 2006 17:17:49 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kALHICDa068526
	for <perforce@freebsd.org>; Tue, 21 Nov 2006 17:18:12 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kALHIChp068522
	for perforce@freebsd.org; Tue, 21 Nov 2006 17:18:12 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 21 Nov 2006 17:18:12 GMT
Message-Id: <200611211718.kALHIChp068522@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 110285 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Nov 2006 17:24:35 -0000

http://perforce.freebsd.org/chv.cgi?CH=110285

Change 110285 by imp@imp_paco-paco on 2006/11/20 06:41:20

	Loopback

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91.c#25 integrate

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/at91.c#25 (text+ko) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.9 2006/11/19 23:47:51 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.10 2006/11/20 06:27:15 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -412,12 +412,12 @@
 	    AT91RM92_SYS_SIZE, &sc->sc_sys_sh) != 0)
 		panic("Enable to map IRQ registers");
 	sc->obio.sc_irq_rman.rm_type = RMAN_ARRAY;
-	sc->obio.sc_irq_rman.rm_descr = "AT91RM92 IRQs";
+	sc->obio.sc_irq_rman.rm_descr = "AT91 IRQs";
 	sc->obio.sc_mem_rman.rm_type = RMAN_ARRAY;
-	sc->obio.sc_mem_rman.rm_descr = "AT91RM92 Memory";
+	sc->obio.sc_mem_rman.rm_descr = "AT91 Memory";
 #if 0
 	sc->sc_usbmem_rman.rm_type = RMAN_ARRAY;
-	sc->sc_usbmem_rman.rm_descr = "AT91RM92 USB Memory-mapped regs";
+	sc->sc_usbmem_rman.rm_descr = "AT91RM9200 USB Memory-mapped regs";
 #endif
 	if (rman_init(&sc->obio.sc_irq_rman) != 0 ||
 	    rman_manage_region(&sc->obio.sc_irq_rman, 1, 31) != 0)