diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:01 -0400 |
| commit | e36fcd8ae611b91f0bbaf6063b0b98e1ef955880 (patch) | |
| tree | 751b37949e1ca165828cad4bbe2f39d24a8a4d4f | |
| parent | 5457f2194ad198a0aba4190ec99a6a81846fdca5 (diff) | |
| parent | 8419dc8a34d765f2ff1aa4051084d54cfeff09cf (diff) | |
| download | op-kernel-dev-e36fcd8ae611b91f0bbaf6063b0b98e1ef955880.zip op-kernel-dev-e36fcd8ae611b91f0bbaf6063b0b98e1ef955880.tar.gz | |
Merge branch 'upstream-fixes' into upstream
| -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 64631bd..4776f4e 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 */ }; |
