diff options
| author | markj <markj@FreeBSD.org> | 2014-09-04 21:06:33 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2014-09-04 21:06:33 +0000 |
| commit | a3123049c0e7bcdf24b67343907e9539b5c568df (patch) | |
| tree | 8e8f6fc677ed7077119804eb90a3dc2b87da7da2 | |
| parent | e47626077f4efb90b2e9dd4b29f11ad783859bc1 (diff) | |
| download | FreeBSD-src-a3123049c0e7bcdf24b67343907e9539b5c568df.zip FreeBSD-src-a3123049c0e7bcdf24b67343907e9539b5c568df.tar.gz | |
Add mrsas(4) to GENERIC for i386 and amd64.
Approved by: ambrisko, kadesai
MFC after: 3 days
| -rw-r--r-- | sys/amd64/conf/GENERIC | 1 | ||||
| -rw-r--r-- | sys/conf/NOTES | 1 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 4269889..698f510 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -164,6 +164,7 @@ device aacraid # Adaptec by PMC RAID device ida # Compaq Smart RAID device mfi # LSI MegaRAID SAS device mlx # Mylex DAC960 family +device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s #XXX pointer/int warnings #device pst # Promise Supertrak SX6000 device twe # 3ware ATA RAID diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 98788e0..3a07838 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1677,6 +1677,7 @@ device amrp # SCSI Passthrough interface (optional, CAM req.) device mfi # LSI MegaRAID SAS device mfip # LSI MegaRAID SAS passthrough, requires CAM options MFI_DEBUG +device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s # # 3ware ATA RAID diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 0cbf5c8..fec8f75 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -168,6 +168,7 @@ device aacraid # Adaptec by PMC RAID device ida # Compaq Smart RAID device mfi # LSI MegaRAID SAS device mlx # Mylex DAC960 family +device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s device pst # Promise Supertrak SX6000 device twe # 3ware ATA RAID |
