svn commit: r271137 - in head/sys: amd64/conf conf i386/conf

[Mark Johnston]

Author: markj
Date: Thu Sep  4 21:06:33 2014
New Revision: 271137
URL: http://svnweb.freebsd.org/changeset/base/271137

Log:
  Add mrsas(4) to GENERIC for i386 and amd64.
  
  Approved by:	ambrisko, kadesai
  MFC after:	3 days

Modified:
  head/sys/amd64/conf/GENERIC
  head/sys/conf/NOTES
  head/sys/i386/conf/GENERIC

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC	Thu Sep  4 21:05:04 2014	(r271136)
+++ head/sys/amd64/conf/GENERIC	Thu Sep  4 21:06:33 2014	(r271137)
@@ -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

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Thu Sep  4 21:05:04 2014	(r271136)
+++ head/sys/conf/NOTES	Thu Sep  4 21:06:33 2014	(r271137)
@@ -1677,6 +1677,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: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC	Thu Sep  4 21:05:04 2014	(r271136)
+++ head/sys/i386/conf/GENERIC	Thu Sep  4 21:06:33 2014	(r271137)
@@ -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