diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/RAMDISK | 6 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/RAMDISK_CD | 6 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISKB | 6 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 4 |
6 files changed, 11 insertions, 19 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index acd9f42a02a..be7b8af3c4c 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.141 2006/06/07 18:47:16 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.142 2006/06/15 22:25:37 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -240,8 +240,6 @@ ahc* at pci? # Adaptec 2940 SCSI controllers scsibus* at ahc? ahd* at pci? # Adaptec 79?? SCSI controllers scsibus* at ahd? -mpt* at pci? # LSI Fusion-MPT SCSI/Fibre -scsibus* at mpt? mpi* at pci? # LSI Logic Message Passing Interface scsibus* at mpi? #dpt* at pci? # DPT SmartCache/SmartRAID PCI diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK index abf816397e8..9152ba9d37f 100644 --- a/sys/arch/amd64/conf/RAMDISK +++ b/sys/arch/amd64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.33 2006/05/19 04:17:31 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.34 2006/06/15 22:25:37 deraadt Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -123,8 +123,8 @@ ahc* at pci? # Adaptec 2940 SCSI controllers scsibus* at ahc? #ahd* at pci? # Adaptec 79?? SCSI controllers #scsibus* at ahd? -mpt* at pci? # LSI Fusion-MPT SCSI/Fibre -scsibus* at mpt? +mpi* at pci? # LSI Logic Message Passing Interface +scsibus* at mpi? #dpt* at pci? # DPT SmartCache/SmartRAID PCI #scsibus* at dpt? #gdt* at pci? # ICP Vortex GDT RAID controllers diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index ba24a1e316d..174528a816c 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.57 2006/06/01 09:50:30 brad Exp $ +# $OpenBSD: RAMDISK_CD,v 1.58 2006/06/15 22:25:37 deraadt Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -141,9 +141,7 @@ ahc* at pci? # Adaptec 2940 SCSI controllers scsibus* at ahc? ahd* at pci? # Adaptec 79?? SCSI controllers scsibus* at ahd? -mpt* at pci? # LSI Fusion-MPT SCSI/Fibre -scsibus* at mpt? -mpi* at pci? # LSI Logic Fusion-MPT Message Passing Interface +mpi* at pci? # LSI Logic Message Passing Interface scsibus* at mpi? #dpt* at pci? # DPT SmartCache/SmartRAID PCI #scsibus* at dpt? diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index eda3cab202b..04e790bd799 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.505 2006/06/13 03:01:04 gwk Exp $ +# $OpenBSD: GENERIC,v 1.506 2006/06/15 22:25:37 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -331,8 +331,6 @@ ahc* at pci? # Adaptec 2940/3940/78?? SCSI controllers scsibus* at ahc? ahd* at pci? # Adaptec 79?? SCSI controllers scsibus* at ahd? -mpt* at pci? # LSI Fusion-MPT SCSI/Fibre -scsibus* at mpt? mpi* at pci? # LSI Logic Fusion MPT Message Passing Interface scsibus* at mpi? dpt* at pci? # DPT SmartCache/SmartRAID PCI diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB index 8c62daf8c47..a466f8eb779 100644 --- a/sys/arch/i386/conf/RAMDISKB +++ b/sys/arch/i386/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.89 2006/05/19 04:17:31 deraadt Exp $ +# $OpenBSD: RAMDISKB,v 1.90 2006/06/15 22:25:37 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -129,8 +129,8 @@ pccom2 at isa? port 0x3e8 irq 5 #scsibus* at ahc? ahd* at pci? # Adaptec 79?? SCSI controllers scsibus* at ahd? -mpt* at pci? # LSI Fusion-MPT SCSI/Fibre -scsibus* at mpt? +mpi* at pci? # LSI Logic Fusion-MPT Message Passing Interface +scsibus* at mpi? dpt* at pci? # DPT SmartCache/SmartRAID PCI dpt* at eisa? # DPT SmartCache/SmartRAID EISA scsibus* at dpt? diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index d987c534738..c0caaa8a7df 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.122 2006/06/01 09:50:26 brad Exp $ +# $OpenBSD: RAMDISK_CD,v 1.123 2006/06/15 22:25:37 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -187,8 +187,6 @@ ahc* at pci? # Adaptec 2940/3940/78?? SCSI controllers scsibus* at ahc? ahd* at pci? # Adaptec 79?? SCSI controllers scsibus* at ahd? -mpt* at pci? # LSI Fusion-MPT SCSI/Fibre -scsibus* at mpt? mpi* at pci? # LSI Logic Fusion-MPT Message Passing Interface scsibus* at mpi? dpt* at pci? # DPT SmartCache/SmartRAID PCI |