[src/trunk]: src/sys/dev/pci deal with a DELAY vs. delay issue

[sommerfeld <sommerfeld%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cc5ed7e4dc13
branches:  trunk
changeset: 482744:cc5ed7e4dc13
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Sun Feb 20 22:19:29 2000 +0000

description:
deal with a DELAY vs. delay issue

diffstat:

 sys/dev/pci/ncr.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 58e713a37c42 -r cc5ed7e4dc13 sys/dev/pci/ncr.c
--- a/sys/dev/pci/ncr.c Sun Feb 20 22:03:49 2000 +0000
+++ b/sys/dev/pci/ncr.c Sun Feb 20 22:19:29 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr.c,v 1.93 1999/12/26 10:41:22 tsutsui Exp $ */
+/*     $NetBSD: ncr.c,v 1.94 2000/02/20 22:19:29 sommerfeld Exp $      */
 
 /**************************************************************************
 **
@@ -237,6 +237,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #ifndef __alpha__
+#undef DELAY
 #define DELAY(x)       delay(x)
 #endif
 #include <dev/scsipi/scsi_all.h>
@@ -1524,7 +1525,7 @@
 
 #if 0
 static char ident[] =
-       "\n$NetBSD: ncr.c,v 1.93 1999/12/26 10:41:22 tsutsui Exp $\n";
+       "\n$NetBSD: ncr.c,v 1.94 2000/02/20 22:19:29 sommerfeld Exp $\n";
 #endif
 
 static const u_long    ncr_version = NCR_VERSION       * 11