diff options
author | Brice Goglin <brice@myri.com> | 2006-06-22 21:11:59 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 23:35:19 -0400 |
commit | 69eb887b0c2380791d33f7c07bfba88d7c5cef15 (patch) | |
tree | c825bedddbc9fd6fd3094aff7d74af7e95a5b1d9 /drivers/net/myri10ge | |
parent | af57d238aa2107e1b45d8dacad6e50db938f0567 (diff) |
[PATCH] myri10ge - drop workaround for the missing AER ext cap on nVidia CK804
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>
Diffstat (limited to 'drivers/net/myri10ge')
-rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 1a2b9785e998..5058def3b625 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
@@ -2251,12 +2251,6 @@ static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp) | |||
2251 | } | 2251 | } |
2252 | 2252 | ||
2253 | cap = pci_find_ext_capability(bridge, PCI_EXT_CAP_ID_ERR); | 2253 | cap = pci_find_ext_capability(bridge, PCI_EXT_CAP_ID_ERR); |
2254 | /* nvidia ext cap is not always linked in ext cap chain */ | ||
2255 | if (!cap | ||
2256 | && bridge->vendor == PCI_VENDOR_ID_NVIDIA | ||
2257 | && bridge->device == PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_PCIE) | ||
2258 | cap = 0x160; | ||
2259 | |||
2260 | if (!cap) | 2254 | if (!cap) |
2261 | return; | 2255 | return; |
2262 | 2256 | ||