diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 1320ba7c410..5c7f7c035f4 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -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
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index deed451a233..dc11f73c430 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -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