From d0dcb4072a07b25700cf2d81bdc80f7656e804b2 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Thu, 8 Feb 2007 01:03:17 +0100
Subject: [PATCH] --- yaml --- r: 48991 b: refs/heads/master c:
 66822b2eef8de9fe3ec9fa837386817565dbe690 h: refs/heads/master i:   48989:
 f3f1cf2f0fa394295626db4bbebb28346b1391e1   48987:
 8184b688ae3d0cb8a5aca2aa731ff18be4822575   48983:
 b39fadb27c805b64937a342d42bba33419bcad19   48975:
 4cba0ba68aacdb84fa4f3cc48a7e00b445d409f4   48959:
 a3284f56981d13e55f70a3733548ee2e4ec20239 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/arm/mach-iop32x/n2100.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d4f399b60a2a..24f68a1b005f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14d178a143568f3651a40af6defadd44fb0b6b81
+refs/heads/master: 66822b2eef8de9fe3ec9fa837386817565dbe690
diff --git a/trunk/arch/arm/mach-iop32x/n2100.c b/trunk/arch/arm/mach-iop32x/n2100.c
index 2499a7707e3c..966aa51aee09 100644
--- a/trunk/arch/arm/mach-iop32x/n2100.c
+++ b/trunk/arch/arm/mach-iop32x/n2100.c
@@ -120,6 +120,20 @@ static struct hw_pci n2100_pci __initdata = {
 	.map_irq	= n2100_pci_map_irq,
 };
 
+/*
+ * Both r8169 chips on the n2100 exhibit PCI parity problems.  Set
+ * the ->broken_parity_status flag for both ports so that the r8169
+ * driver knows it should ignore error interrupts.
+ */
+static void n2100_fixup_r8169(struct pci_dev *dev)
+{
+	if (dev->bus->number == 0 &&
+	    (dev->devfn == PCI_DEVFN(1, 0) ||
+	     dev->devfn == PCI_DEVFN(2, 0)))
+		dev->broken_parity_status = 1;
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_REALTEK, PCI_ANY_ID, n2100_fixup_r8169);
+
 static int __init n2100_pci_init(void)
 {
 	if (machine_is_n2100())