From dac30ef086e46058f18aca66979d049c06d7fc5f Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Mon, 12 Oct 1998 11:32:35 +0000
Subject: Added flag CC_QUIET for quiet conflict checking.

Fixed corrupted tabs.
---
 sys/i386/isa/isa_device.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index 9faf0c8..17aad1d 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id: isa_device.h,v 1.53 1998/09/03 21:01:22 nsouch Exp $
+ *	$Id: isa_device.h,v 1.54 1998/09/15 10:04:08 gibbs Exp $
  */
 
 #ifndef _I386_ISA_ISA_DEVICE_H_
@@ -73,11 +73,12 @@ struct isa_device {
 /*
  * Bits to specify the type and amount of conflict checking.
  */
-#define CC_ATTACH       (1 << 0)
-#define CC_DRQ          (1 << 1)
-#define CC_IOADDR       (1 << 2)
-#define CC_IRQ          (1 << 3)
-#define CC_MEMADDR      (1 << 4)
+#define	CC_ATTACH	(1 << 0)
+#define	CC_DRQ		(1 << 1)
+#define	CC_IOADDR	(1 << 2)
+#define	CC_IRQ		(1 << 3)
+#define	CC_MEMADDR	(1 << 4)
+#define	CC_QUIET	(1 << 5)
 
 /*
  * Per-driver structure.
-- 
cgit v1.1