diff options
| author | bde <bde@FreeBSD.org> | 1996-12-23 19:12:29 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1996-12-23 19:12:29 +0000 |
| commit | be356f2ac15e6cb5dbda77c4fdd85eea9c8f3723 (patch) | |
| tree | 501070888d10e32216884f24b156c90ae7620422 /sys/pci/ncr.c | |
| parent | de2eeae4b682e73d8e33f91ee18563f4994adef3 (diff) | |
| download | FreeBSD-src-be356f2ac15e6cb5dbda77c4fdd85eea9c8f3723.zip FreeBSD-src-be356f2ac15e6cb5dbda77c4fdd85eea9c8f3723.tar.gz | |
Don't redefine SCSI_NCR_DFLT_TAGS even in if FAILSAFE is defined.
Diffstat (limited to 'sys/pci/ncr.c')
| -rw-r--r-- | sys/pci/ncr.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c index f729b1e..41de44d 100644 --- a/sys/pci/ncr.c +++ b/sys/pci/ncr.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: ncr.c,v 1.89 1996/12/16 14:31:45 se Exp $ +** $Id: ncr.c,v 1.90 1996/12/21 12:32:34 se Exp $ ** ** Device driver for the NCR 53C810 PCI-SCSI-Controller. ** @@ -55,10 +55,12 @@ #include "opt_ncr.h" #endif /* defined (__FreeBSD__) && defined(KERNEL) */ -#ifdef FAILSAFE +#ifdef FAILSAFE +#ifndef SCSI_NCR_DFLT_TAGS #define SCSI_NCR_DFLT_TAGS (0) +#endif /* SCSI_NCR_DFLT_TAGS */ #define CDROM_ASYNC -#endif /* FAILSAFE */ +#endif /* FAILSAFE */ /*========================================================== ** @@ -1261,7 +1263,7 @@ static void ncr_attach (pcici_t tag, int unit); static char ident[] = - "\n$Id: ncr.c,v 1.89 1996/12/16 14:31:45 se Exp $\n"; + "\n$Id: ncr.c,v 1.90 1996/12/21 12:32:34 se Exp $\n"; static const u_long ncr_version = NCR_VERSION * 11 + (u_long) sizeof (struct ncb) * 7 |
