svn commit: r271233 - in stable/9/sys: amd64/conf conf i386/conf

[Mark Johnston]

Author: markj
Date: Sun Sep  7 18:42:45 2014
New Revision: 271233
URL: http://svnweb.freebsd.org/changeset/base/271233

Log:
  MFC r271137:
  Add mrsas(4) to GENERIC for i386 and amd64.

Modified:
  stable/9/sys/amd64/conf/GENERIC
  stable/9/sys/conf/NOTES
  stable/9/sys/i386/conf/GENERIC
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/conf/   (props changed)

Modified: stable/9/sys/amd64/conf/GENERIC
==============================================================================
--- stable/9/sys/amd64/conf/GENERIC	Sun Sep  7 18:32:42 2014	(r271232)
+++ stable/9/sys/amd64/conf/GENERIC	Sun Sep  7 18:42:45 2014	(r271233)
@@ -151,6 +151,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

Modified: stable/9/sys/conf/NOTES
==============================================================================
--- stable/9/sys/conf/NOTES	Sun Sep  7 18:32:42 2014	(r271232)
+++ stable/9/sys/conf/NOTES	Sun Sep  7 18:42:45 2014	(r271233)
@@ -1673,6 +1673,7 @@ device		amrp		# SCSI Passthrough interfa
 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

Modified: stable/9/sys/i386/conf/GENERIC
==============================================================================
--- stable/9/sys/i386/conf/GENERIC	Sun Sep  7 18:32:42 2014	(r271232)
+++ stable/9/sys/i386/conf/GENERIC	Sun Sep  7 18:42:45 2014	(r271233)
@@ -158,6 +158,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