diff options
| author | gjb <gjb@FreeBSD.org> | 2015-07-31 15:25:07 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-07-31 15:25:07 +0000 |
| commit | ad05cf684ab82058ad1fdf2e7592340552e05ac1 (patch) | |
| tree | 1b11267114c3d1a29baeb5c4b1f41a8b53b16748 /sys/i386/conf | |
| parent | b0aaac698f0ea6fd4d30e402ebe1d96f98110f7c (diff) | |
| download | FreeBSD-src-ad05cf684ab82058ad1fdf2e7592340552e05ac1.zip FreeBSD-src-ad05cf684ab82058ad1fdf2e7592340552e05ac1.tar.gz | |
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
Diffstat (limited to 'sys/i386/conf')
| -rw-r--r-- | sys/i386/conf/GENERIC | 3 |
1 files changed, 2 insertions, 1 deletions
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 |
