diff options
| author | markj <markj@FreeBSD.org> | 2014-09-07 18:43:26 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2014-09-07 18:43:26 +0000 |
| commit | 7b2b287dbf81eabcee64d51b730ff49a92bdb104 (patch) | |
| tree | 41f4545ebbbb581415504c93a54c4e61f4c3c446 | |
| parent | b6cfb220f7437cd349e531e2a4db9338ab6521b4 (diff) | |
| download | FreeBSD-src-7b2b287dbf81eabcee64d51b730ff49a92bdb104.zip FreeBSD-src-7b2b287dbf81eabcee64d51b730ff49a92bdb104.tar.gz | |
MFC r271137:
Add mrsas(4) to GENERIC for i386 and amd64.
Approved by: re (gjb)
| -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 3fbd7ba..8a7763d 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -156,6 +156,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 709ef24..66f257b 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1672,6 +1672,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 5fa8c30..4ec939a 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -162,6 +162,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 |
