From: Jeff Garzik <jeff@garzik.org>
Date: Mon, 24 Jul 2006 07:37:52 +0000 (-0400)
Subject: [libata] sata_promise: comment out duplicate PCI ID
X-Git-Tag: v2.6.18-rc3~10^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8419dc8a34d765f2ff1aa4051084d54cfeff09cf;p=linux-2.6

[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.
---

diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index 64631bd389..4776f4e558 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 */
 };