diff options
| author | imp <imp@FreeBSD.org> | 2015-08-03 13:49:46 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2015-08-03 13:49:46 +0000 |
| commit | 04e6a60087f2bb8f3eebcc2f894981c42ff929ec (patch) | |
| tree | cd831cb98276262a05a18000d5c289d097f98efa /sys/amd64/conf | |
| parent | 4f67d9c92c33079ff58c795f4d4c0b5a4f9089d2 (diff) | |
| download | FreeBSD-src-04e6a60087f2bb8f3eebcc2f894981c42ff929ec.zip FreeBSD-src-04e6a60087f2bb8f3eebcc2f894981c42ff929ec.tar.gz | |
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
Diffstat (limited to 'sys/amd64/conf')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 1320ba7..5c7f7c0 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -170,8 +170,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 #XXX pointer/int warnings #device pst # Promise Supertrak SX6000 device twe # 3ware ATA RAID |
