[src/trunk]: src/sys/arch/i386/conf pull up stuff changed in GENERIC from 1.3...

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

details:   https://anonhg.NetBSD.org/src/rev/eeffab6fad3b
branches:  trunk
changeset: 499352:eeffab6fad3b
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sat Nov 18 02:08:30 2000 +0000

description:
pull up stuff changed in GENERIC from 1.370 - 1.377, appropriately
commented out if it's not relevant to a laptop

diffstat:

 sys/arch/i386/conf/CARDBUS |  29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diffs (78 lines):

diff -r 2e2a5e0b4c9d -r eeffab6fad3b sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS        Sat Nov 18 02:00:50 2000 +0000
+++ b/sys/arch/i386/conf/CARDBUS        Sat Nov 18 02:08:30 2000 +0000
@@ -1,14 +1,14 @@
-#      $NetBSD: CARDBUS,v 1.26 2000/10/15 10:08:00 minoura Exp $
+#      $NetBSD: CARDBUS,v 1.27 2000/11/18 02:08:30 lukem Exp $
 #
-#      CARDBUS -- GENERIC + CardBus support.  Additionally, some
-#      things typically not found on laptops have been removed.
+#      CARDBUS: GENERIC + CardBus support.  Additionally, some
+#      things typically not found on laptops have been commented out.
 
-#      from: GENERIC,v 1.370 2000/09/20 18:22:22 thorpej Exp
+#      from: GENERIC,v 1.377 2000/11/14 19:52:05 augustss Exp
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident         "CARDBUS-$Revision: 1.26 $"
+#ident         "CARDBUS-$Revision: 1.27 $"
 
 maxusers       32              # estimated number of users
 
@@ -148,6 +148,7 @@
 options        USBVERBOSE      # verbose USB device autoconfig messages
 #options       PNPBIOSVERBOSE  # verbose PnP BIOS messages
 #options       PNPBIOSDEBUG    # more fulsome Pnp BIOS debugging messages
+#options       I2OVERBOSE      # verbose I2O driver messages
 
 options        NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
 
@@ -382,6 +383,12 @@
 #viaenv* at viapm?
 
 
+# I2O devices
+#iop*  at pci? dev ? function ?        # I/O processor
+#iopsp*        at iop? tid ?                   # SCSI/FC-AL ports
+#lsu*  at iop? tid ?                   # block devices
+
+
 # SCSI Controllers and Devices
 
 # PCI SCSI controllers
@@ -441,6 +448,7 @@
 #scsibus* at bha?
 #scsibus* at dpt?
 scsibus* at esp?
+#scsibus* at iopsp?
 #scsibus* at isp?
 #scsibus* at nca?
 #scsibus* at ncr?
@@ -459,9 +467,13 @@
 ss*    at scsibus? target ? lun ?      # SCSI scanners
 uk*    at scsibus? target ? lun ?      # SCSI unknown
 
+
 # RAID controllers and devices
-#cac*  at pci? dev ? function ?        # Compaq array controller
-#ca*   at cac? unit ?                  # Compaq array disk device
+#cac*  at eisa?                        # Compaq EISA array controllers
+#cac*  at pci? dev ? function ?        # Compaq PCI array controllers
+#twe*  at pci? dev ? function ?        # 3ware Escalade RAID controllers
+#lsu*  at cac? unit ?                  # Compaq array disk devices
+#lsu*  at twe? unit ?                  # 3ware array disk devices
 
 
 # IDE and related devices
@@ -693,6 +705,9 @@
 uvisor*        at uhub? port ?
 ucom*  at uvisor?
 
+# USB scanners
+uscanner* at uhub? port ?
+
 # USB Generic driver
 ugen*  at uhub? port ?