Author: imp
Date: Mon Aug  3 13:49:46 2015
New Revision: 286231
URL: https://svnweb.freebsd.org/changeset/base/286231

Log:
  Add pmspvc device back to GENERIC. The issues with the device playing
  grabby hands with other driver's devices has been solved.
  
  MFC After: 3 weeks

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

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Mon Aug  3 13:42:52 2015        (r286230)
+++ head/sys/amd64/conf/GENERIC Mon Aug  3 13:49:46 2015        (r286231)
@@ -170,8 +170,7 @@ 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 PCI ID conflicts with ahd(4) and mvs(4)
-#device                pmspcv                  # PMC-Sierra SAS/SATA 
Controller driver
+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  Mon Aug  3 13:42:52 2015        (r286230)
+++ head/sys/i386/conf/GENERIC  Mon Aug  3 13:49:46 2015        (r286231)
@@ -175,8 +175,7 @@ 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 PCI ID conflicts with ahd(4) and mvs(4)
-#device                pmspcv                  # PMC-Sierra SAS/SATA 
Controller driver
+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