]> err.no Git - linux-2.6/commitdiff
[PATCH] myri10ge - drop workaround for the missing AER ext cap on nVidia CK804
authorBrice Goglin <brice@myri.com>
Fri, 23 Jun 2006 01:11:59 +0000 (21:11 -0400)
committerJeff Garzik <jeff@garzik.org>
Fri, 23 Jun 2006 03:35:19 +0000 (23:35 -0400)
We don't need to hardcode the AER capability of the nVidia CK804 chipset
anymore since commit cf34a8e07f02c76f3f1232eecb681301a3d7b10b (PCI: nVidia
quirk to make AER PCI-E extended capability visible) now makes sure that
this cap will be available to pci_find_ext_capability().

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/myri10ge/myri10ge.c

index 1a2b9785e9986090e4ac5270b788411b48494421..5058def3b6255dff06edae933b0899fc55d03b97 100644 (file)
@@ -2251,12 +2251,6 @@ static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp)
        }
 
        cap = pci_find_ext_capability(bridge, PCI_EXT_CAP_ID_ERR);
-       /* nvidia ext cap is not always linked in ext cap chain */
-       if (!cap
-           && bridge->vendor == PCI_VENDOR_ID_NVIDIA
-           && bridge->device == PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_PCIE)
-               cap = 0x160;
-
        if (!cap)
                return;