From 08b8c7c171b1230be20acf6d7e5fcf831a56bea3 Mon Sep 17 00:00:00 2001 From: Divy Le Ray Date: Tue, 30 Jan 2007 19:44:01 -0800 Subject: [PATCH] --- yaml --- r: 46563 b: refs/heads/master c: b5a44bcbf53f1af1f24e7fe0e5008eca85659220 h: refs/heads/master i: 46561: 1eabeaaf07d8810b4ad3ce1bb0d4842449e34c65 46559: 5dde75c129f3ca91f5fbb1776b378c6a362b72d4 v: v3 --- [refs] | 2 +- trunk/drivers/net/cxgb3/t3_hw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0c16fceff200..160c8850a898 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6195c71d652d337521ec8431c0923a85d6aaaf71 +refs/heads/master: b5a44bcbf53f1af1f24e7fe0e5008eca85659220 diff --git a/trunk/drivers/net/cxgb3/t3_hw.c b/trunk/drivers/net/cxgb3/t3_hw.c index 4545acb3a2d5..22154003fea6 100644 --- a/trunk/drivers/net/cxgb3/t3_hw.c +++ b/trunk/drivers/net/cxgb3/t3_hw.c @@ -1181,7 +1181,6 @@ static int t3_handle_intr_status(struct adapter *adapter, unsigned int reg, static void pci_intr_handler(struct adapter *adapter) { static const struct intr_info pcix1_intr_info[] = { - { F_PEXERR, "PCI PEX error", -1, 1 }, {F_MSTDETPARERR, "PCI master detected parity error", -1, 1}, {F_SIGTARABT, "PCI signaled target abort", -1, 1}, {F_RCVTARABT, "PCI received target abort", -1, 1}, @@ -1218,6 +1217,7 @@ static void pci_intr_handler(struct adapter *adapter) static void pcie_intr_handler(struct adapter *adapter) { static const struct intr_info pcie_intr_info[] = { + {F_PEXERR, "PCI PEX error", -1, 1}, {F_UNXSPLCPLERRR, "PCI unexpected split completion DMA read error", -1, 1}, {F_UNXSPLCPLERRC,