diff options
| author | Warner Losh <imp@FreeBSD.org> | 2015-08-03 13:49:46 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2015-08-03 13:49:46 +0000 |
| commit | 75333e6435aaadc5ae7093d3950b1e40ffd11d17 (patch) | |
| tree | cd831cb98276262a05a18000d5c289d097f98efa /sys/i386/conf/GENERIC | |
| parent | ee95773383413943122d356c95c2808cc16716c9 (diff) | |
| download | src-75333e6435aaadc5ae7093d3950b1e40ffd11d17.tar.gz src-75333e6435aaadc5ae7093d3950b1e40ffd11d17.zip | |
Add pmspvc device back to GENERIC. The issues with the device playing
grabby hands with other driver's devices has been solved.
MFC After: 3 weeks
Notes
Notes:
svn path=/head/; revision=286231
Diffstat (limited to 'sys/i386/conf/GENERIC')
| -rw-r--r-- | sys/i386/conf/GENERIC | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index deed451a2335..dc11f73c4302 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 |