diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c
index a9dd029e6d14..ebed2f51482b 100644
--- a/sys/dev/ic/ncr53c9x.c
+++ b/sys/dev/ic/ncr53c9x.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr53c9x.c,v 1.79 2001/05/18 12:57:42 bouyer Exp $	*/
+/*	$NetBSD: ncr53c9x.c,v 1.80 2001/05/23 18:32:26 petrov Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -1345,7 +1345,7 @@ ncr53c9x_rdfifo(struct ncr53c9x_softc *sc, int how)
 		for (i = 0; i < n; i++)
 			buf[i] = NCR_READ_REG(sc, NCR_FIFO);
 
-		if (sc->sc_espstat2 & FAS_STAT2_ISHUTTLE) {
+		if (sc->sc_espstat2 & NCRFAS_STAT2_ISHUTTLE) {
 
 			NCR_WRITE_REG(sc, NCR_FIFO, 0);
 			buf[i++] = NCR_READ_REG(sc, NCR_FIFO);
@@ -2669,7 +2669,7 @@ msgin:
 		NCR_PHASE(("MESSAGE_IN_PHASE "));
 		if ((sc->sc_espintr & NCRINTR_BS) != 0) {
 			if ((sc->sc_rev != NCR_VARIANT_FAS366) ||
-			    !(sc->sc_espstat2 & FAS_STAT2_EMPTY)) {
+			    !(sc->sc_espstat2 & NCRFAS_STAT2_EMPTY)) {
 				NCRCMD(sc, NCRCMD_FLUSH);
 			}
 			sc->sc_flags |= NCR_WAITI;
diff --git a/sys/dev/ic/ncr53c9xreg.h b/sys/dev/ic/ncr53c9xreg.h
index 1b7b03251eb7..a56f8804d80e 100644
--- a/sys/dev/ic/ncr53c9xreg.h
+++ b/sys/dev/ic/ncr53c9xreg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr53c9xreg.h,v 1.8 2001/03/29 02:58:39 petrov Exp $	*/
+/*	$NetBSD: ncr53c9xreg.h,v 1.9 2001/05/23 18:32:26 petrov Exp $	*/
 
 /*
  * Copyright (c) 1994 Peter Galbavy.  All rights reserved.
@@ -277,12 +277,12 @@
 
 /* status register #2 definitions (read	only) */
 #define NCR_STAT2	NCR_CCF
-#define	FAS_STAT2_SEQCNT   0x01	   /* Sequence counter bit 7-3 enabled */
-#define	FAS_STAT2_FLATCHED 0x02	   /* FIFO flags register latched */
-#define	FAS_STAT2_CLATCHED 0x04	   /* Xfer cntr	& recommand ctr	latched */
-#define	FAS_STAT2_CACTIVE  0x08	   /* Command register is active */
-#define	FAS_STAT2_SCSI16   0x10	   /* SCSI interface is	wide */
-#define	FAS_STAT2_ISHUTTLE 0x20	   /* FIFO Top register	contains 1 byte */
-#define	FAS_STAT2_OSHUTTLE 0x40	   /* next byte	from FIFO is MSB */
-#define	FAS_STAT2_EMPTY	   0x80	   /* FIFO is empty */
+#define	NCRFAS_STAT2_SEQCNT   0x01	   /* Sequence counter bit 7-3 enabled */
+#define	NCRFAS_STAT2_FLATCHED 0x02	   /* FIFO flags register latched */
+#define	NCRFAS_STAT2_CLATCHED 0x04	   /* Xfer cntr	& recommand ctr	latched */
+#define	NCRFAS_STAT2_CACTIVE  0x08	   /* Command register is active */
+#define	NCRFAS_STAT2_SCSI16   0x10	   /* SCSI interface is	wide */
+#define	NCRFAS_STAT2_ISHUTTLE 0x20	   /* FIFO Top register	contains 1 byte */
+#define	NCRFAS_STAT2_OSHUTTLE 0x40	   /* next byte	from FIFO is MSB */
+#define	NCRFAS_STAT2_EMPTY    0x80	   /* FIFO is empty */