diff options
| author | gjb <gjb@FreeBSD.org> | 2015-07-31 15:23:48 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-07-31 15:23:48 +0000 |
| commit | 8ddbbce4f69a8cfe3301e07feb3310636b7017ea (patch) | |
| tree | 755c4a31a5410940bb7e478c7954a3b2d02a7581 /sys/amd64/conf | |
| parent | 5d008d66a8af29d98ae655d0700e03a1aefc8fff (diff) | |
| download | FreeBSD-src-8ddbbce4f69a8cfe3301e07feb3310636b7017ea.zip FreeBSD-src-8ddbbce4f69a8cfe3301e07feb3310636b7017ea.tar.gz | |
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
Diffstat (limited to 'sys/amd64/conf')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 5c7f7c0..1320ba7 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 |
