From effd413ecd41a7a0394f25e90425c9edb9abd1b6 Mon Sep 17 00:00:00 2001
From: cgd <cgd@NetBSD.org>
Date: Mon, 15 Jul 1996 16:40:27 +0000
Subject: [PATCH] before #defining the vtophys() hack for the alpha, #undef
 vtophys since it may be a macro.

---
 sys/dev/ic/midway.c     | 3 ++-
 sys/dev/pci/if_de.c     | 5 +++--
 sys/dev/pci/if_le_pci.c | 3 ++-
 sys/dev/pci/ncr.c       | 5 +++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c
index 7e171c9ce966..a8e903ba0f77 100644
--- a/sys/dev/ic/midway.c
+++ b/sys/dev/ic/midway.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: midway.c,v 1.11 1996/07/14 20:05:31 cgd Exp $	*/
+/*	$NetBSD: midway.c,v 1.12 1996/07/15 16:40:27 cgd Exp $	*/
 /*	(sync'd to midway.c 1.59)	*/
 
 /*
@@ -122,6 +122,7 @@
 #include <dev/ic/midwayvar.h>
 #if defined(__alpha__)
 /* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */
+#undef vtophys
 #define	vtophys(va)	__alpha_bus_XXX_dmamap(sc->en_bc, (void *)(va))
 #endif
 #elif defined(__FreeBSD__)
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index c49e870d5dda..6097d6405526 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*    $NetBSD: if_de.c,v 1.23 1996/06/03 20:30:21 cgd Exp $       */
+/*    $NetBSD: if_de.c,v 1.24 1996/07/15 16:40:40 cgd Exp $       */
 
 /*-
  * Copyright (c) 1994, 1995 Matt Thomas (matt@lkg.dec.com)
@@ -424,9 +424,10 @@ static void tulip_addr_filter(tulip_softc_t *sc);
 
 #if defined(__NetBSD__) && defined(__alpha__)
 /* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */
+#undef vtophys
 #define	vtophys(va)	__alpha_bus_XXX_dmamap(sc->tulip_bc, (void *)(va))
-
 #endif
+
 
 static int
 tulip_dc21040_media_probe(
diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c
index b455013615cc..19a0a74426fb 100644
--- a/sys/dev/pci/if_le_pci.c
+++ b/sys/dev/pci/if_le_pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_le_pci.c,v 1.7 1996/06/03 20:30:29 cgd Exp $	*/
+/*	$NetBSD: if_le_pci.c,v 1.8 1996/07/15 16:40:46 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
@@ -76,6 +76,7 @@
 
 #ifdef __alpha__			/* XXX */
 /* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */ 
+#undef vtophys
 #define	vtophys(va)	__alpha_bus_XXX_dmamap(lesc->sc_bc, (void *)(va))
 #endif
 
diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c
index 1ca9933928cc..9779b19492be 100644
--- a/sys/dev/pci/ncr.c
+++ b/sys/dev/pci/ncr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr.c,v 1.36 1996/06/03 20:30:34 cgd Exp $	*/
+/*	$NetBSD: ncr.c,v 1.37 1996/07/15 16:40:52 cgd Exp $	*/
 
 /**************************************************************************
 **
@@ -211,6 +211,7 @@ extern PRINT_ADDR();
 
 #if defined(__NetBSD__) && defined(__alpha__)
 /* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */
+#undef vtophys
 #define	vtophys(va)	__alpha_bus_XXX_dmamap(np->sc_bc, (void *)(va))
 #endif
 
@@ -1329,7 +1330,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 #if 0
 static char ident[] =
-	"\n$NetBSD: ncr.c,v 1.36 1996/06/03 20:30:34 cgd Exp $\n";
+	"\n$NetBSD: ncr.c,v 1.37 1996/07/15 16:40:52 cgd Exp $\n";
 #endif
 
 u_long	ncr_version = NCR_VERSION	* 11