[src/sommerfeld_i386mp_1]: src/sys/arch/i386/conf Merge up with -current

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

details:   https://anonhg.NetBSD.org/src/rev/93db2fe54c3e
branches:  sommerfeld_i386mp_1
changeset: 482397:93db2fe54c3e
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Sun May 13 00:48:51 2001 +0000

description:
Merge up with -current

diffstat:

 sys/arch/i386/conf/CARDBUS        |  6 +++---
 sys/arch/i386/conf/GENERIC        |  6 +++---
 sys/arch/i386/conf/GENERIC_LAPTOP |  6 +++---
 sys/arch/i386/conf/IOPENER        |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diffs (106 lines):

diff -r a37f07b0e19a -r 93db2fe54c3e sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS        Sun May 13 00:45:03 2001 +0000
+++ b/sys/arch/i386/conf/CARDBUS        Sun May 13 00:48:51 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: CARDBUS,v 1.28.2.3 2001/04/30 16:23:08 sommerfeld Exp $
+#      $NetBSD: CARDBUS,v 1.28.2.4 2001/05/13 00:48:51 sommerfeld Exp $
 #
 #      CARDBUS: GENERIC + CardBus support.  Additionally, some
 #      things typically not found on laptops have been commented out.
@@ -8,7 +8,7 @@
 
 include "arch/i386/conf/std.i386"
 
-#ident         "CARDBUS-$Revision: 1.28.2.3 $"
+#ident         "CARDBUS-$Revision: 1.28.2.4 $"
 
 maxusers       32              # estimated number of users
 
@@ -148,7 +148,7 @@
 options        SCSIVERBOSE     # human readable SCSI error messages
 options        USBVERBOSE      # verbose USB device autoconfig messages
 #options       PNPBIOSVERBOSE  # verbose PnP BIOS messages
-#options       PNPBIOSDEBUG    # more fulsome Pnp BIOS debugging messages
+#options       PNPBIOSDEBUG    # more fulsome PnP BIOS debugging messages
 #options       I2OVERBOSE      # verbose I2O driver messages
 
 options        NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
diff -r a37f07b0e19a -r 93db2fe54c3e sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sun May 13 00:45:03 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sun May 13 00:48:51 2001 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC,v 1.300.2.15 2001/05/07 17:07:21 sommerfeld Exp $
+#      $NetBSD: GENERIC,v 1.300.2.16 2001/05/13 00:48:52 sommerfeld Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.300.2.15 $"
+#ident                 "GENERIC-$Revision: 1.300.2.16 $"
 
 maxusers       32              # estimated number of users
 
@@ -145,7 +145,7 @@
 options        SCSIVERBOSE     # human readable SCSI error messages
 options        USBVERBOSE      # verbose USB device autoconfig messages
 #options       PNPBIOSVERBOSE  # verbose PnP BIOS messages
-#options       PNPBIOSDEBUG    # more fulsome Pnp BIOS debugging messages
+#options       PNPBIOSDEBUG    # more fulsome PnP BIOS debugging messages
 options        I2OVERBOSE      # verbose I2O driver messages
 
 options        NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
diff -r a37f07b0e19a -r 93db2fe54c3e sys/arch/i386/conf/GENERIC_LAPTOP
--- a/sys/arch/i386/conf/GENERIC_LAPTOP Sun May 13 00:45:03 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP Sun May 13 00:48:51 2001 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: GENERIC_LAPTOP,v 1.8.2.3 2001/04/30 16:23:08 sommerfeld Exp $
+#      $NetBSD: GENERIC_LAPTOP,v 1.8.2.4 2001/05/13 00:48:52 sommerfeld Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "GENERIC-$Revision: 1.8.2.3 $"
+#ident                 "GENERIC-$Revision: 1.8.2.4 $"
 
 maxusers       32              # estimated number of users
 
@@ -144,7 +144,7 @@
 options        SCSIVERBOSE     # human readable SCSI error messages
 options        USBVERBOSE      # verbose USB device autoconfig messages
 #options       PNPBIOSVERBOSE  # verbose PnP BIOS messages
-#options       PNPBIOSDEBUG    # more fulsome Pnp BIOS debugging messages
+#options       PNPBIOSDEBUG    # more fulsome PnP BIOS debugging messages
 
 options        NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
 
diff -r a37f07b0e19a -r 93db2fe54c3e sys/arch/i386/conf/IOPENER
--- a/sys/arch/i386/conf/IOPENER        Sun May 13 00:45:03 2001 +0000
+++ b/sys/arch/i386/conf/IOPENER        Sun May 13 00:48:51 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: IOPENER,v 1.11.4.3 2001/04/30 16:23:09 sommerfeld Exp $
+#      $NetBSD: IOPENER,v 1.11.4.4 2001/05/13 00:48:52 sommerfeld Exp $
 #
 #      IOPENER -- GENERIC-like kernel for the Netpliance i-opener
 #      from: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp
@@ -6,7 +6,7 @@
 
 include "arch/i386/conf/std.i386"
 
-#ident                 "IOPENER-$Revision: 1.11.4.3 $"
+#ident                 "IOPENER-$Revision: 1.11.4.4 $"
 
 maxusers       32              # estimated number of users
 
@@ -129,7 +129,7 @@
 #options       SCSIVERBOSE     # human readable SCSI error messages
 options        USBVERBOSE      # verbose USB device autoconfig messages
 #options       PNPBIOSVERBOSE  # verbose PnP BIOS messages
-#options       PNPBIOSDEBUG    # more fulsome Pnp BIOS debugging messages
+#options       PNPBIOSDEBUG    # more fulsome PnP BIOS debugging messages
 options        NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
 
 #