[src/trunk]: src/sys/arch/mac68k/nubus Do not define the same symbol with two...

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

details:   https://anonhg.NetBSD.org/src/rev/d6d1ac2d2a04
branches:  trunk
changeset: 500217:d6d1ac2d2a04
user:      briggs <briggs%NetBSD.org@localhost>
date:      Fri Dec 08 14:28:44 2000 +0000

description:
Do not define the same symbol with two different values.  PR#11664.

diffstat:

 sys/arch/mac68k/nubus/nubus.h |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (32 lines):

diff -r d473729aba69 -r d6d1ac2d2a04 sys/arch/mac68k/nubus/nubus.h
--- a/sys/arch/mac68k/nubus/nubus.h     Fri Dec 08 10:24:14 2000 +0000
+++ b/sys/arch/mac68k/nubus/nubus.h     Fri Dec 08 14:28:44 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nubus.h,v 1.52 2000/12/05 05:05:52 briggs Exp $        */
+/*     $NetBSD: nubus.h,v 1.53 2000/12/08 14:28:44 briggs Exp $        */
 
 /*
  * Copyright (c) 1995 Allen Briggs.  All rights reserved.
@@ -127,14 +127,14 @@
 #define  NUBUS_TYPE_68030      0x0004
 #define  NUBUS_TYPE_68040      0x0005
 
-#define NUBUS_CATEGORY_INTBUS  0x000C
-#define  NUBUS_TYPE_SCSI       0x0008
-#define   NUBUS_DRSW_AWGSPDS   0x0006
-#define    NUBUS_DRHW_AWGSPDS  0x0100
-#define   NUBUS_DRSW_PLI       0x0108
-#define    NUBUS_DRHW_PLI      0x0100
-#define   NUBUS_DRSW_FWB       0x010C
-#define    NUBUS_DRHW_FWB      0x0100
+#define NUBUS_CATEGORY_INTBUS          0x000C
+#define  NUBUS_TYPE_SCSI               0x0008
+#define   NUBUS_DRSW_AWGSPDS_SCSI      0x0006
+#define    NUBUS_DRHW_AWGSPDS_SCSI     0x0100
+#define   NUBUS_DRSW_PLI               0x0108
+#define    NUBUS_DRHW_PLI              0x0100
+#define   NUBUS_DRSW_FWB               0x010C
+#define    NUBUS_DRHW_FWB              0x0100
 
 /*
  * This is the same as Apple's Format Block for a card, with the