diff options
| author | David S. Miller <davem@davemloft.net> | 2011-10-07 13:38:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-07 13:38:43 -0400 |
| commit | 88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9 (patch) | |
| tree | 08c4399e0341f7eb0ccb24e15f2cab687275c2a4 /drivers/net/ethernet/chelsio/cxgb4 | |
| parent | 8083f0fc969d9b5353061a7a6f963405057e26b1 (diff) | |
| parent | 3ee72ca99288f1de95ec9c570e43f531c8799f06 (diff) | |
Merge branch 'master' of github.com:davem330/net
Conflicts:
net/batman-adv/soft-interface.c
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb4')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index 40b395f932c..4c8f42afa3c 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | |||
| @@ -3715,6 +3715,9 @@ static int __devinit init_one(struct pci_dev *pdev, | |||
| 3715 | setup_debugfs(adapter); | 3715 | setup_debugfs(adapter); |
| 3716 | } | 3716 | } |
| 3717 | 3717 | ||
| 3718 | /* PCIe EEH recovery on powerpc platforms needs fundamental reset */ | ||
| 3719 | pdev->needs_freset = 1; | ||
| 3720 | |||
| 3718 | if (is_offload(adapter)) | 3721 | if (is_offload(adapter)) |
| 3719 | attach_ulds(adapter); | 3722 | attach_ulds(adapter); |
| 3720 | 3723 | ||