svn commit: r194655 - head/sys/arm/xscale/ixp425

[Sam Leffler]

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;