Author: gjb
Date: Fri Jul 31 15:23:48 2015
New Revision: 286131
URL: https://svnweb.freebsd.org/changeset/base/286131

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

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

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Fri Jul 31 14:17:26 2015        (r286130)
+++ head/sys/amd64/conf/GENERIC Fri Jul 31 15:23:48 2015        (r286131)
@@ -170,7 +170,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: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC  Fri Jul 31 14:17:26 2015        (r286130)
+++ head/sys/i386/conf/GENERIC  Fri Jul 31 15:23:48 2015        (r286131)
@@ -175,7 +175,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
 
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to