diff options
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/conf/files | 6 | ||||
| -rw-r--r-- | sys/dev/pci/files.pci | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index b38eff6b574..a7c8a700b92 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.479 2006/03/29 14:10:52 jsg Exp $ +# $OpenBSD: GENERIC,v 1.480 2006/04/06 20:25:13 marco Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -59,7 +59,7 @@ isa0 at gscpcib? eisa0 at mainbus0 pci* at mainbus0 -option ACPIVERBOSE +#option ACPIVERBOSE #option ACPI_ENABLE #acpi0 at mainbus? @@ -335,6 +335,8 @@ scsibus* at twe? #scsibus* at aac? ami* at pci? # AMI MegaRAID controllers scsibus* at ami? +#mfi* at pci? # LSI MegaRAID SAS controllers +#scsibus* at mfi? cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers cac* at eisa? scsibus* at cac? diff --git a/sys/conf/files b/sys/conf/files index 54f6c748ff7..28ab048af88 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.368 2006/03/21 18:40:54 reyk Exp $ +# $OpenBSD: files,v 1.369 2006/04/06 20:25:14 marco Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -172,6 +172,10 @@ file dev/ic/ciss.c ciss device ami: scsi file dev/ic/ami.c ami +# LSI MegaRAID SAS controllers +device mfi: scsi +file dev/ic/mfi.c mfi + # Qlogic ISP 10x0 SCSI Controllers device isp: scsi file dev/ic/isp.c isp diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci index ece36d77d33..025f7df6d9b 100644 --- a/sys/dev/pci/files.pci +++ b/sys/dev/pci/files.pci @@ -1,4 +1,4 @@ -# $OpenBSD: files.pci,v 1.201 2006/03/16 21:32:34 matthieu Exp $ +# $OpenBSD: files.pci,v 1.202 2006/04/06 20:25:14 marco Exp $ # $NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $ # # Config file and device description for machine-independent PCI code. @@ -78,6 +78,10 @@ file dev/pci/twe_pci.c twe_pci attach ami at pci with ami_pci file dev/pci/ami_pci.c ami_pci +# LSI MegaRAID SAS RAID controllers +attach mfi at pci with mfi_pci +file dev/pci/mfi_pci.c mfi_pci + # I2O attach iop at pci with iop_pci file dev/pci/iop_pci.c iop_pci |