From 64de3044ea45879e4a1fcf431ee0dc963f6daab5 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Mon, 24 Jul 2006 03:38:01 -0400
Subject: [PATCH] --- yaml --- r: 35355 b: refs/heads/master c:
 e36fcd8ae611b91f0bbaf6063b0b98e1ef955880 h: refs/heads/master i:   35353:
 71c8b826ce28b91b05f1c5a8d7294ec3caab9689   35351:
 cf04e07c23cdb9ce0f4c3b8f244a4a67115d59b8 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/scsi/sata_promise.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7f6682732214..1d8a24186f63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5457f2194ad198a0aba4190ec99a6a81846fdca5
+refs/heads/master: e36fcd8ae611b91f0bbaf6063b0b98e1ef955880
diff --git a/trunk/drivers/scsi/sata_promise.c b/trunk/drivers/scsi/sata_promise.c
index 64631bd38952..4776f4e55839 100644
--- a/trunk/drivers/scsi/sata_promise.c
+++ b/trunk/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 */
 };