From ad05cf684ab82058ad1fdf2e7592340552e05ac1 Mon Sep 17 00:00:00 2001 From: gjb Date: Fri, 31 Jul 2015 15:25:07 +0000 Subject: 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 --- sys/i386/conf/GENERIC | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sys/i386/conf') diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 409eea8..1a4762d 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -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 -- cgit v1.1