Merge branch 'upstream-fixes' into upstream

git-mirror · Jul 24, 2006 · e36fcd8 · e36fcd8
2 parents 5457f21 + 8419dc8
commit e36fcd8
Showing 1 changed file with 7 additions and 0 deletions.
diff --git 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 */
 };