diff --git a/sys/arch/i386/conf/ARMADA b/sys/arch/i386/conf/ARMADA index 83da4b704ea4..b109c3a6ba58 100644 --- a/sys/arch/i386/conf/ARMADA +++ b/sys/arch/i386/conf/ARMADA @@ -1,4 +1,4 @@ -# $NetBSD: ARMADA,v 1.6 2001/11/04 07:39:40 itohy Exp $ +# $NetBSD: ARMADA,v 1.7 2001/11/04 09:00:38 yamt 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.6 $" +#ident "CARDBUS-$Revision: 1.7 $" maxusers 32 # estimated number of users @@ -443,6 +443,7 @@ esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI # CardBus SCSI cards ahc* at cardbus? dev ? function ? # Adaptec ADP-1480 +adv* at cardbus? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI # SCSI bus support #scsibus* at adv? diff --git a/sys/arch/i386/conf/CARDBUS b/sys/arch/i386/conf/CARDBUS index e544e1634f54..1ce83ac7dc01 100644 --- a/sys/arch/i386/conf/CARDBUS +++ b/sys/arch/i386/conf/CARDBUS @@ -1,4 +1,4 @@ -# $NetBSD: CARDBUS,v 1.41 2001/11/04 07:39:40 itohy Exp $ +# $NetBSD: CARDBUS,v 1.42 2001/11/04 09:00:38 yamt 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.41 $" +#ident "CARDBUS-$Revision: 1.42 $" maxusers 32 # estimated number of users @@ -453,6 +453,7 @@ esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI # CardBus SCSI cards ahc* at cardbus? dev ? function ? # Adaptec ADP-1480 +adv* at cardbus? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI # MCA SCSI cards #aha* at mca? slot ? # Adaptec AHA-1640 diff --git a/sys/arch/i386/conf/DELPHI b/sys/arch/i386/conf/DELPHI index b917b608b850..6306b24b2cc5 100644 --- a/sys/arch/i386/conf/DELPHI +++ b/sys/arch/i386/conf/DELPHI @@ -1,11 +1,11 @@ -# $NetBSD: DELPHI,v 1.5 2001/08/22 15:39:06 hubertf Exp $ +# $NetBSD: DELPHI,v 1.6 2001/11/04 09:00:38 yamt Exp $ # # DELPHI -- one of thorpej@zembu.com's devel machines # include "arch/i386/conf/std.i386" -ident "DELPHI-$Revision: 1.5 $" +ident "DELPHI-$Revision: 1.6 $" maxusers 64 # estimated number of users @@ -381,6 +381,7 @@ ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI # CardBus SCSI cards #ahc* at cardbus? dev ? function ? # Adaptec ADP-1480 +#adv* at cardbus? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI # SCSI bus support #scsibus* at adv? diff --git a/sys/arch/i386/conf/DR-EVIL b/sys/arch/i386/conf/DR-EVIL index b3e6ad68357d..75b4fa243a0b 100644 --- a/sys/arch/i386/conf/DR-EVIL +++ b/sys/arch/i386/conf/DR-EVIL @@ -1,4 +1,4 @@ -# $NetBSD: DR-EVIL,v 1.31 2001/11/04 07:39:40 itohy Exp $ +# $NetBSD: DR-EVIL,v 1.32 2001/11/04 09:00:38 yamt Exp $ # # DR-EVIL -- Dell Inspiron 3800 laptop used by thorpej@netbsd.org # @@ -421,6 +421,7 @@ esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI # CardBus SCSI cards ahc* at cardbus? dev ? function ? # Adaptec ADP-1480 +adv* at cardbus? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI # SCSI bus support #scsibus* at adv? diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 4e98833daf36..4de3404a79c3 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,11 +1,11 @@ -# $NetBSD: GENERIC,v 1.434 2001/11/04 07:39:41 itohy Exp $ +# $NetBSD: GENERIC,v 1.435 2001/11/04 09:00:39 yamt Exp $ # # GENERIC -- everything that's currently supported # include "arch/i386/conf/std.i386" -#ident "GENERIC-$Revision: 1.434 $" +#ident "GENERIC-$Revision: 1.435 $" maxusers 32 # estimated number of users @@ -456,6 +456,7 @@ wds1 at isa? port 0x358 irq 11 drq 5 # CardBus SCSI cards #ahc* at cardbus? dev ? function ? # Adaptec ADP-1480 +#adv* at cardbus? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI # MCA SCSI cards aha* at mca? slot ? # Adaptec AHA-1640 diff --git a/sys/arch/i386/conf/GENERIC_LAPTOP b/sys/arch/i386/conf/GENERIC_LAPTOP index b19537008a8e..69d8b47030b6 100644 --- a/sys/arch/i386/conf/GENERIC_LAPTOP +++ b/sys/arch/i386/conf/GENERIC_LAPTOP @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_LAPTOP,v 1.27 2001/11/04 07:39:41 itohy Exp $ +# $NetBSD: GENERIC_LAPTOP,v 1.28 2001/11/04 09:00:39 yamt Exp $ # From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp # # GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled @@ -6,7 +6,7 @@ include "arch/i386/conf/std.i386" -#ident "GENERIC-$Revision: 1.27 $" +#ident "GENERIC-$Revision: 1.28 $" maxusers 32 # estimated number of users @@ -390,6 +390,7 @@ esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI # CardBus SCSI cards ahc* at cardbus? dev ? function ? # Adaptec ADP-1480 +adv* at cardbus? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI # SCSI bus support scsibus* at ahc? diff --git a/sys/arch/i386/conf/INSTALL_LAPTOP b/sys/arch/i386/conf/INSTALL_LAPTOP index 35e3c876ecf8..5bfe90686347 100644 --- a/sys/arch/i386/conf/INSTALL_LAPTOP +++ b/sys/arch/i386/conf/INSTALL_LAPTOP @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_LAPTOP,v 1.11 2001/09/14 21:44:22 nathanw Exp $ +# $NetBSD: INSTALL_LAPTOP,v 1.12 2001/11/04 09:00:39 yamt Exp $ # # INSTALL - Installation kernel. # @@ -298,7 +298,9 @@ com2 at isa? port 0x3e8 irq 5 # PCMCIA SCSI controllers aic* at pcmcia? function ? # Adaptec APA-1460 SCSI +# CardBus SCSI cards ahc* at cardbus? dev ? function ? # Adaptec ADP-1480 +adv* at cardbus? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI # SCSI bus support scsibus* at ahc? diff --git a/sys/arch/i386/conf/SWINGER b/sys/arch/i386/conf/SWINGER index 0de3299ce97a..5583d182270f 100644 --- a/sys/arch/i386/conf/SWINGER +++ b/sys/arch/i386/conf/SWINGER @@ -1,4 +1,4 @@ -# $NetBSD: SWINGER,v 1.18 2001/08/22 15:39:06 hubertf Exp $ +# $NetBSD: SWINGER,v 1.19 2001/11/04 09:00:39 yamt Exp $ # from NetBSD: GENERIC,v 1.325 2000/04/14 14:53:32 augustss Exp # # SWINGER -- thorpej's Abit BP6+dual Celeron @@ -6,7 +6,7 @@ include "arch/i386/conf/std.i386" -#ident "SWINGER-$Revision: 1.18 $" +#ident "SWINGER-$Revision: 1.19 $" maxusers 64 # estimated number of users @@ -380,6 +380,7 @@ siop* at pci? dev ? function ? # Symbios 53c8xx SCSI # CardBus SCSI cards #ahc* at cardbus? dev ? function ? # Adaptec ADP-1480 +#adv* at cardbus? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI # SCSI bus support #scsibus* at adv?