summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik2006-07-24 09:37:52 +0200
committerJeff Garzik2006-07-24 09:37:52 +0200
commit8419dc8a34d765f2ff1aa4051084d54cfeff09cf (patch)
tree31b1ea2716b99ca0b12cfc051d53cfdcd9118be5
parent[PATCH] libata: improve EH action and EHI flag handling (diff)
downloadkernel-qcow2-linux-8419dc8a34d765f2ff1aa4051084d54cfeff09cf.tar.gz
kernel-qcow2-linux-8419dc8a34d765f2ff1aa4051084d54cfeff09cf.tar.xz
kernel-qcow2-linux-8419dc8a34d765f2ff1aa4051084d54cfeff09cf.zip
[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.
-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 64631bd38952..4776f4e55839 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 */
};