From owner-svn-src-head@FreeBSD.ORG  Mon Jun 22 20:42:28 2009
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 A51ED1065673;
	Mon, 22 Jun 2009 20:42:28 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 930108FC30;
	Mon, 22 Jun 2009 20:42:28 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5MKgSgS052086;
	Mon, 22 Jun 2009 20:42:28 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5MKgSci052084;
	Mon, 22 Jun 2009 20:42:28 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200906222042.n5MKgSci052084@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Mon, 22 Jun 2009 20:42:28 +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: r194655 - head/sys/arm/xscale/ixp425
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: Mon, 22 Jun 2009 20:42:29 -0000

Author: sam
Date: Mon Jun 22 20:42:28 2009
New Revision: 194655
URL: http://svn.freebsd.org/changeset/base/194655

Log:
  always define Cambria GPS+RS485 mappings as they are no longer conditional

Modified:
  head/sys/arm/xscale/ixp425/ixp425.c

Modified: head/sys/arm/xscale/ixp425/ixp425.c
==============================================================================
--- head/sys/arm/xscale/ixp425/ixp425.c	Mon Jun 22 20:41:02 2009	(r194654)
+++ head/sys/arm/xscale/ixp425/ixp425.c	Mon Jun 22 20:42:28 2009	(r194655)
@@ -443,16 +443,12 @@ gethwvtrans(uint32_t hwbase, uint32_t si
 	    { .hwbase	= IXP435_USB2_HWBASE,
 	      .size 	= IXP435_USB2_SIZE,
 	      .vbase	= IXP435_USB2_VBASE },
-#ifdef CAMBRIA_GPS_VBASE
 	    { .hwbase	= CAMBRIA_GPS_HWBASE,
 	      .size 	= CAMBRIA_GPS_SIZE,
 	      .vbase	= CAMBRIA_GPS_VBASE },
-#endif
-#ifdef CAMBRIA_RS485_VBASE
 	    { .hwbase	= CAMBRIA_RS485_HWBASE,
 	      .size 	= CAMBRIA_RS485_SIZE,
 	      .vbase	= CAMBRIA_RS485_VBASE },
-#endif
 	};
 	int i;