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

[Glen Barber]

Author: gjb
Date: Fri Jul 31 15:25:07 2015
New Revision: 286132
URL: https://svnweb.freebsd.org/changeset/base/286132

Log:
  MFC r286131:
   Pull pmspcv (pms(4)) from GENERIC.  It has PCI ID conflicts
   with ahd(4), mvs(4), and likely other drivers.
  
  With hat:	re
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/amd64/conf/GENERIC
  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	Fri Jul 31 15:23:48 2015	(r286131)
+++ stable/10/sys/amd64/conf/GENERIC	Fri Jul 31 15:25:07 2015	(r286132)
@@ -160,7 +160,8 @@ 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		pmspcv			# PMC-Sierra SAS/SATA Controller driver
+#XXX PCI ID conflicts with ahd(4) and mvs(4)
+#device		pmspcv			# PMC-Sierra SAS/SATA Controller driver
 #XXX pointer/int warnings
 #device		pst			# Promise Supertrak SX6000
 device		twe			# 3ware ATA RAID

Modified: stable/10/sys/i386/conf/GENERIC
==============================================================================
--- stable/10/sys/i386/conf/GENERIC	Fri Jul 31 15:23:48 2015	(r286131)
+++ stable/10/sys/i386/conf/GENERIC	Fri Jul 31 15:25:07 2015	(r286132)
@@ -166,7 +166,8 @@ 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		pmspcv			# PMC-Sierra SAS/SATA Controller driver
+#XXX PCI ID conflicts with ahd(4) and mvs(4)
+#device		pmspcv			# PMC-Sierra SAS/SATA Controller driver
 device		pst			# Promise Supertrak SX6000
 device		twe			# 3ware ATA RAID