diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:21:17 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:21:17 -0500 |
| commit | ce1e7a2ac721eb9d825b63f74752d0c9e0c635c2 (patch) | |
| tree | a7c0d18d6486734dffb9498e30db5b226b6e23bf /drivers/scsi/sata_promise.c | |
| parent | c2956a3b0d1c17b38da369811a6ce93eb7a01a04 (diff) | |
| parent | 75deb6fa985bd3162b9472f1fc394e23294da816 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/sata_promise.c')
| -rw-r--r-- | drivers/scsi/sata_promise.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c index 7fa807d7d9e1..e5862ad5e6cd 100644 --- a/drivers/scsi/sata_promise.c +++ b/drivers/scsi/sata_promise.c | |||
| @@ -256,6 +256,8 @@ static const struct pci_device_id pdc_ata_pci_tbl[] = { | |||
| 256 | board_20319 }, | 256 | board_20319 }, |
| 257 | { PCI_VENDOR_ID_PROMISE, 0x3319, PCI_ANY_ID, PCI_ANY_ID, 0, 0, | 257 | { PCI_VENDOR_ID_PROMISE, 0x3319, PCI_ANY_ID, PCI_ANY_ID, 0, 0, |
| 258 | board_20319 }, | 258 | board_20319 }, |
| 259 | { PCI_VENDOR_ID_PROMISE, 0x3515, PCI_ANY_ID, PCI_ANY_ID, 0, 0, | ||
| 260 | board_20319 }, | ||
| 259 | { PCI_VENDOR_ID_PROMISE, 0x3519, PCI_ANY_ID, PCI_ANY_ID, 0, 0, | 261 | { PCI_VENDOR_ID_PROMISE, 0x3519, PCI_ANY_ID, PCI_ANY_ID, 0, 0, |
| 260 | board_20319 }, | 262 | board_20319 }, |
| 261 | { PCI_VENDOR_ID_PROMISE, 0x3d17, PCI_ANY_ID, PCI_ANY_ID, 0, 0, | 263 | { PCI_VENDOR_ID_PROMISE, 0x3d17, PCI_ANY_ID, PCI_ANY_ID, 0, 0, |