From owner-svn-src-head@FreeBSD.ORG  Tue Jul 10 02:44:16 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6293A106566C;
	Tue, 10 Jul 2012 02:44:16 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D99B8FC14;
	Tue, 10 Jul 2012 02:44:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6A2iGrM054960;
	Tue, 10 Jul 2012 02:44:16 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6A2iGXv054957;
	Tue, 10 Jul 2012 02:44:16 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201207100244.q6A2iGXv054957@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 10 Jul 2012 02:44:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238332 - head/sys/arm/at91
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jul 2012 02:44:16 -0000

Author: imp
Date: Tue Jul 10 02:44:15 2012
New Revision: 238332
URL: http://svn.freebsd.org/changeset/base/238332

Log:
  Missed one of the special AT91SAM9xxx_BASE defines.  This should be
  AT91_BASE.

Modified:
  head/sys/arm/at91/at91sam9260.c
  head/sys/arm/at91/at91sam9260reg.h

Modified: head/sys/arm/at91/at91sam9260.c
==============================================================================
--- head/sys/arm/at91/at91sam9260.c	Tue Jul 10 02:39:03 2012	(r238331)
+++ head/sys/arm/at91/at91sam9260.c	Tue Jul 10 02:44:15 2012	(r238332)
@@ -158,8 +158,8 @@ at91_add_child(device_t dev, int prio, c
 		bus_set_resource(kid, SYS_RES_IRQ, 1, irq1, 1);
 	if (irq2 != 0)
 		bus_set_resource(kid, SYS_RES_IRQ, 2, irq2, 1);
-	if (addr != 0 && addr < AT91SAM9260_BASE)
-		addr += AT91SAM9260_BASE;
+	if (addr != 0 && addr < AT91_BASE)
+		addr += AT91_BASE;
 	if (addr != 0)
 		bus_set_resource(kid, SYS_RES_MEMORY, 0, addr, size);
 }

Modified: head/sys/arm/at91/at91sam9260reg.h
==============================================================================
--- head/sys/arm/at91/at91sam9260reg.h	Tue Jul 10 02:39:03 2012	(r238331)
+++ head/sys/arm/at91/at91sam9260reg.h	Tue Jul 10 02:44:15 2012	(r238332)
@@ -72,8 +72,6 @@
 #define AT91_CHIPSELECT_7 0x80000000
 
 
-#define AT91SAM9260_BASE	0xd0000000
-
 #define AT91SAM9260_EMAC_BASE 0xffc4000
 #define AT91SAM9260_EMAC_SIZE 0x4000