Date: Tue, 10 Jul 2012 02:44:16 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r238332 - head/sys/arm/at91 Message-ID: <201207100244.q6A2iGXv054957@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207100244.q6A2iGXv054957>