aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-07-24 03:37:52 -0400
committerJeff Garzik <jeff@garzik.org>2006-07-24 03:37:52 -0400
commit8419dc8a34d765f2ff1aa4051084d54cfeff09cf (patch)
tree31b1ea2716b99ca0b12cfc051d53cfdcd9118be5 /drivers/scsi
parent13abf50df209008b5d44075bafeeab42ace56aa6 (diff)
downloadkernel_samsung_smdk4412-8419dc8a34d765f2ff1aa4051084d54cfeff09cf.zip
kernel_samsung_smdk4412-8419dc8a34d765f2ff1aa4051084d54cfeff09cf.tar.gz
kernel_samsung_smdk4412-8419dc8a34d765f2ff1aa4051084d54cfeff09cf.tar.bz2
[libata] sata_promise: comment out duplicate PCI ID
This is just the for-RC fix. A 'TODO' command is added, describing what's needed for the more-complete fix.
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/sata_promise.c7
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 */
};