From 45e1c1a38ddd03e64a8913aac6080d55a30b4adc Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Fri, 31 Jul 2015 15:23:48 +0000 Subject: [PATCH] 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 --- sys/amd64/conf/GENERIC | 3 ++- sys/i386/conf/GENERIC | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 5c7f7c035f4..1320ba7c410 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -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 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index dc11f73c430..deed451a233 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -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