From: Sebastien Dugue <sebastien.dugue@bull.net>

  V2: removed the HT1000 bridge from the quirk_msi_ht_cap quirk as suggested
      by Michael Chan.

Signed-off-by: Sebastien Dugue <sebastien.dugue@bull.net>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Michael Chan <mchan@broadcom.com>
Cc: Andy Currid <acurrid@nvidia.com>
Cc: Peer Chen <pchen@nvidia.com>
Cc: Prakash Punnoor <prakash@punnoor.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/pci/quirks.c |    3 ---
 1 file changed, 3 deletions(-)

diff -puN drivers/pci/quirks.c~quirk-enable-msi-mapping-on-ht1000-v2 drivers/pci/quirks.c
--- a/drivers/pci/quirks.c~quirk-enable-msi-mapping-on-ht1000-v2
+++ a/drivers/pci/quirks.c
@@ -1711,9 +1711,6 @@ static void __devinit quirk_msi_ht_cap(s
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE,
 			quirk_msi_ht_cap);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS,
-			PCI_DEVICE_ID_SERVERWORKS_HT1000_PXB,
-			quirk_msi_ht_cap);
 
 
 /*
_