diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-28 22:47:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-28 22:47:44 -0700 |
| commit | dc710afe95ee9b263ab593c11d86a684f1606872 (patch) | |
| tree | 2b4ea32bed1a010a3046069dd834f62bc071c92c /drivers/scsi/sata_promise.c | |
| parent | 4da3dcf34671fa15c4f01101754106d97fc98e6e (diff) | |
| parent | ab3b3fd38125be0242c2f94bf144b48054210882 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] sata_promise: comment out duplicate PCI ID
[PATCH] libata: improve EH action and EHI flag handling
[PATCH] libata: fix eh_skip_recovery condition
[PATCH] libata: fix autopsy ehc->i.action and ehc->i.dev handling
Diffstat (limited to 'drivers/scsi/sata_promise.c')
| -rw-r--r-- | drivers/scsi/sata_promise.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c index 64631bd3895..4776f4e5583 100644 --- a/drivers/scsi/sata_promise.c +++ b/drivers/scsi/sata_promise.c @@ -269,8 +269,15 @@ static const struct pci_device_id pdc_ata_pci_tbl[] = { { PCI_VENDOR_ID_PROMISE, 0x6629, PCI_ANY_ID, PCI_ANY_ID, 0, 0, board_20619 }, +/* TODO: remove all associated board_20771 code, as it completely + * duplicates board_2037x code, unless reason for separation can be + * divined. + */ +#if 0 { PCI_VENDOR_ID_PROMISE, 0x3570, PCI_ANY_ID, PCI_ANY_ID, 0, 0, board_20771 }, +#endif + { } /* terminate list */ }; |