svn commit: r271234 - in stable/10/sys: amd64/conf conf i386/conf

[Mark Johnston]

Author: markj
Date: Sun Sep  7 18:43:26 2014
New Revision: 271234
URL: http://svnweb.freebsd.org/changeset/base/271234

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

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

Modified: stable/10/sys/amd64/conf/GENERIC
==============================================================================
--- stable/10/sys/amd64/conf/GENERIC	Sun Sep  7 18:42:45 2014	(r271233)
+++ stable/10/sys/amd64/conf/GENERIC	Sun Sep  7 18:43:26 2014	(r271234)
@@ -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

Modified: stable/10/sys/conf/NOTES
==============================================================================
--- stable/10/sys/conf/NOTES	Sun Sep  7 18:42:45 2014	(r271233)
+++ stable/10/sys/conf/NOTES	Sun Sep  7 18:43:26 2014	(r271234)
@@ -1672,6 +1672,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/10/sys/i386/conf/GENERIC
==============================================================================
--- stable/10/sys/i386/conf/GENERIC	Sun Sep  7 18:42:45 2014	(r271233)
+++ stable/10/sys/i386/conf/GENERIC	Sun Sep  7 18:43:26 2014	(r271234)
@@ -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