[src/trunk]: src/sys/dev remove duplicate cpp defs.

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

details:   https://anonhg.NetBSD.org/src/rev/649f7d572f7b
branches:  trunk
changeset: 538598:649f7d572f7b
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Oct 23 02:32:36 2002 +0000

description:
remove duplicate cpp defs.

diffstat:

 sys/dev/ic/siopvar_common.h |  4 +---
 sys/dev/pci/bktr/bktr_reg.h |  3 +--
 sys/dev/usb/uaudioreg.h     |  3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diffs (52 lines):

diff -r ad603def32cb -r 649f7d572f7b sys/dev/ic/siopvar_common.h
--- a/sys/dev/ic/siopvar_common.h       Wed Oct 23 02:06:11 2002 +0000
+++ b/sys/dev/ic/siopvar_common.h       Wed Oct 23 02:32:36 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: siopvar_common.h,v 1.21 2002/05/04 18:43:22 bouyer Exp $       */
+/*     $NetBSD: siopvar_common.h,v 1.22 2002/10/23 02:32:36 christos Exp $     */
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -68,8 +68,6 @@
        scr_table_t data[SIOP_NSG]; /* 96 */
 } __attribute__((__packed__));
 
-#define offsetof(type, member)     ((size_t)(&((type *)0)->member))
-
 /* status can hold the SCSI_* status values, and 2 additionnal values: */
 #define SCSI_SIOP_NOCHECK      0xfe    /* don't check the scsi status */
 #define SCSI_SIOP_NOSTATUS     0xff    /* device didn't report status */
diff -r ad603def32cb -r 649f7d572f7b sys/dev/pci/bktr/bktr_reg.h
--- a/sys/dev/pci/bktr/bktr_reg.h       Wed Oct 23 02:06:11 2002 +0000
+++ b/sys/dev/pci/bktr/bktr_reg.h       Wed Oct 23 02:32:36 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bktr_reg.h,v 1.10 2001/09/18 18:15:53 wiz Exp $        */
+/*     $NetBSD: bktr_reg.h,v 1.11 2002/10/23 02:32:36 christos Exp $   */
 
 /*
  * FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.42 2000/10/31 13:09:56 roger Exp
@@ -656,7 +656,6 @@
 #define        METEOR_OUTPUT_FMT_MASK  0x040f0000
 #define        METEOR_WANT_TS          0x08000000      /* time-stamp a frame */
 #define METEOR_RGB             0x20000000      /* meteor rgb unit */
-#define METEOR_FIELD_MODE      0x80000000
     u_char     tflags;                         /* Tuner flags (/dev/tuner) */
 #define        TUNER_INITIALIZED       0x00000001
 #define        TUNER_OPEN              0x00000002 
diff -r ad603def32cb -r 649f7d572f7b sys/dev/usb/uaudioreg.h
--- a/sys/dev/usb/uaudioreg.h   Wed Oct 23 02:06:11 2002 +0000
+++ b/sys/dev/usb/uaudioreg.h   Wed Oct 23 02:32:36 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uaudioreg.h,v 1.10 2002/09/22 23:21:30 augustss Exp $  */
+/*     $NetBSD: uaudioreg.h,v 1.11 2002/10/23 02:32:37 christos Exp $  */
 
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -39,7 +39,6 @@
 
 #define UAUDIO_VERSION         0x100
 
-#define UDESC_CS_DEVICE                0x21
 #define UDESC_CS_CONFIG                0x22
 #define UDESC_CS_STRING                0x23
 #define UDESC_CS_INTERFACE     0x24