diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-05-26 00:27:57 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-05-26 00:27:57 +0000 |
| commit | 729a9d7ceffba9e7e741540048479eed9907601e (patch) | |
| tree | 716f1614729ffc0b602e2fdfece3bc84b3e930b1 /sys/dev/pci/ncr.c | |
| parent | 8102ec86d426fccfffa292d80d3e50914c22a932 (diff) | |
sync 0521
Diffstat (limited to 'sys/dev/pci/ncr.c')
| -rw-r--r-- | sys/dev/pci/ncr.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c index 56433f73cd4..55dfddbb607 100644 --- a/sys/dev/pci/ncr.c +++ b/sys/dev/pci/ncr.c @@ -1,5 +1,5 @@ -/* $OpenBSD: ncr.c,v 1.8 1996/05/07 07:38:40 deraadt Exp $ */ -/* $NetBSD: ncr.c,v 1.34 1996/05/03 17:39:49 christos Exp $ */ +/* $OpenBSD: ncr.c,v 1.9 1996/05/26 00:27:45 deraadt Exp $ */ +/* $NetBSD: ncr.c,v 1.35 1996/05/13 00:03:26 mycroft Exp $ */ /************************************************************************** ** @@ -195,9 +195,7 @@ extern PRINT_ADDR(); #else #include <sys/device.h> #include <machine/bus.h> -#ifdef __alpha__ #include <machine/intr.h> -#endif #include <dev/pci/ncr_reg.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> @@ -1331,7 +1329,7 @@ static void ncr_attach (pcici_t tag, int unit); #if 0 static char ident[] = - "\n$NetBSD: ncr.c,v 1.34 1996/05/03 17:39:49 christos Exp $\n"; + "\n$NetBSD: ncr.c,v 1.35 1996/05/13 00:03:26 mycroft Exp $\n"; #endif u_long ncr_version = NCR_VERSION * 11 |