diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-26 21:40:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 21:40:25 -0400 |
| commit | 462cee296476278acaa54c41925b3273e0e4dd40 (patch) | |
| tree | c9d9fcfc4dd62807cb67678a6eda0151bfa8be95 /drivers/scsi/sata_promise.c | |
| parent | 126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c (diff) | |
| parent | 4ec5240ec367a592834385893200dd4fb369354c (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
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 19a13e3590f4..c4e9e0298122 100644 --- a/drivers/scsi/sata_promise.c +++ b/drivers/scsi/sata_promise.c | |||
| @@ -151,6 +151,8 @@ static struct ata_port_info pdc_port_info[] = { | |||
| 151 | static struct pci_device_id pdc_ata_pci_tbl[] = { | 151 | static struct pci_device_id pdc_ata_pci_tbl[] = { |
| 152 | { PCI_VENDOR_ID_PROMISE, 0x3371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, | 152 | { PCI_VENDOR_ID_PROMISE, 0x3371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, |
| 153 | board_2037x }, | 153 | board_2037x }, |
| 154 | { PCI_VENDOR_ID_PROMISE, 0x3571, PCI_ANY_ID, PCI_ANY_ID, 0, 0, | ||
| 155 | board_2037x }, | ||
| 154 | { PCI_VENDOR_ID_PROMISE, 0x3373, PCI_ANY_ID, PCI_ANY_ID, 0, 0, | 156 | { PCI_VENDOR_ID_PROMISE, 0x3373, PCI_ANY_ID, PCI_ANY_ID, 0, 0, |
| 155 | board_2037x }, | 157 | board_2037x }, |
| 156 | { PCI_VENDOR_ID_PROMISE, 0x3375, PCI_ANY_ID, PCI_ANY_ID, 0, 0, | 158 | { PCI_VENDOR_ID_PROMISE, 0x3375, PCI_ANY_ID, PCI_ANY_ID, 0, 0, |