[src/thorpej_scsipi]: src/sys Kill unwanted differences with HEAD

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

details:   https://anonhg.NetBSD.org/src/rev/aeab0302f7f2
branches:  thorpej_scsipi
changeset: 477486:aeab0302f7f2
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Mon Apr 23 15:30:27 2001 +0000

description:
Kill unwanted differences with HEAD

diffstat:

 sys/arch/i386/conf/GENERIC |  17 +++++++----------
 sys/net/if_gif.c           |   4 ++--
 sys/net/if_stf.c           |   4 ++--
 3 files changed, 11 insertions(+), 14 deletions(-)

diffs (81 lines):

diff -r f852b92c7425 -r aeab0302f7f2 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Mon Apr 23 13:41:43 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC        Mon Apr 23 15:30:27 2001 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.264.2.13 2001/04/23 09:41:45 bouyer Exp $
+#      $NetBSD: GENERIC,v 1.264.2.14 2001/04/23 15:30:27 bouyer Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.264.2.13 $"
+#ident                 "GENERIC-$Revision: 1.264.2.14 $"
 
 maxusers       32              # estimated number of users
 
@@ -376,7 +376,7 @@
 # Hardware monitors 
 
 # LM7[89] and compatible hardware monitors
-lm0    at isa? port 0x290              # other common ports: 0x280, 0x310
+#lm0   at isa? port 0x290              # other common ports: 0x280, 0x310
 
 # VIA VT82C686A hardware monitor
 #viapm*        at pci? dev ? function ?
@@ -427,8 +427,8 @@
 bha1   at isa? port 0x334 irq ? drq ?
 # The "nca" and "dpt" probes might give false hits or hang your machine.
 #dpt0  at isa? port 0x170 irq ? drq ?  # DPT SmartCache/SmartRAID
-nca0   at isa? port 0x360 irq 15       # Port-mapped NCR 53C80 controller
-nca1   at isa? iomem 0xd8000 irq 5     # Memory-mapped controller (T128, etc.)
+#nca0  at isa? port 0x360 irq 15       # Port-mapped NCR 53C80 controller
+#nca1  at isa? iomem 0xd8000 irq 5     # Memory-mapped controller (T128, etc.)
 sea0   at isa? iomem 0xc8000 irq 5     # Seagate/Future Domain SCSI
 uha0   at isa? port 0x330 irq ? drq ?  # UltraStor [13]4f SCSI
 uha1   at isa? port 0x340 irq ? drq ?
@@ -448,9 +448,9 @@
 scsibus* at bha?
 scsibus* at dpt?
 scsibus* at esp?
+scsibus* at iopsp?
 scsibus* at isp?
-scsibus* at iopsp?
-scsibus* at nca?
+#scsibus* at nca?
 #scsibus* at ncr?
 scsibus* at pcscp?
 scsibus* at sea?
@@ -568,9 +568,6 @@
 #options       TLP_MATCH_21140
 #options       TLP_MATCH_21142
 vr*    at pci? dev ? function ?        # VIA Rhine Fast Ethernet
-lmc*   at pci? dev ? function ?        # Lan Media Corp SSI/HSSI/DS3
-rtk*   at pci? dev ? function ?        # Realtek 8129/8139
-ti*    at pci? dev ? function ?        # netgear gigabit
 
 # EISA network interfaces
 ep*    at eisa? slot ?                 # 3Com 3c579 Ethernet
diff -r f852b92c7425 -r aeab0302f7f2 sys/net/if_gif.c
--- a/sys/net/if_gif.c  Mon Apr 23 13:41:43 2001 +0000
+++ b/sys/net/if_gif.c  Mon Apr 23 15:30:27 2001 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: if_gif.c,v 1.2.4.7 2001/04/21 17:46:39 bouyer Exp $    */
-/*     $KAME: if_gif.c,v 1.34 2000/10/07 03:58:53 itojun Exp $ */
+/*     $NetBSD: if_gif.c,v 1.2.4.8 2001/04/23 15:30:29 bouyer Exp $    */
+/*     $KAME: if_gif.c,v 1.43 2001/02/20 08:51:07 itojun Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
diff -r f852b92c7425 -r aeab0302f7f2 sys/net/if_stf.c
--- a/sys/net/if_stf.c  Mon Apr 23 13:41:43 2001 +0000
+++ b/sys/net/if_stf.c  Mon Apr 23 15:30:27 2001 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: if_stf.c,v 1.5.2.8 2001/04/21 17:46:41 bouyer Exp $    */
-/*     $KAME: if_stf.c,v 1.51 2001/01/22 07:27:16 itojun Exp $ */
+/*     $NetBSD: if_stf.c,v 1.5.2.9 2001/04/23 15:30:30 bouyer Exp $    */
+/*     $KAME: if_stf.c,v 1.53 2001/02/16 03:00:30 itojun Exp $ */
 
 /*
  * Copyright (C) 2000 WIDE Project.