diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-09 02:00:54 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-09 02:00:54 -0500 |
| commit | d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4 (patch) | |
| tree | daab7cc0db83226672f76d2fc9277e4355f89e6b /drivers/net/qlge/qlge_main.c | |
| parent | 9e0d57fd6dad37d72a3ca6db00ca8c76f2215454 (diff) | |
| parent | 2606289779cb297320a185db5997729d29b6700b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/can/usb/ems_usb.c
Diffstat (limited to 'drivers/net/qlge/qlge_main.c')
| -rw-r--r-- | drivers/net/qlge/qlge_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 0de596ad8a7e..bd8e164b121c 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
| @@ -4145,6 +4145,8 @@ static int __devinit ql_init_device(struct pci_dev *pdev, | |||
| 4145 | goto err_out; | 4145 | goto err_out; |
| 4146 | } | 4146 | } |
| 4147 | 4147 | ||
| 4148 | /* Set PCIe reset type for EEH to fundamental. */ | ||
| 4149 | pdev->needs_freset = 1; | ||
| 4148 | pci_save_state(pdev); | 4150 | pci_save_state(pdev); |
| 4149 | qdev->reg_base = | 4151 | qdev->reg_base = |
| 4150 | ioremap_nocache(pci_resource_start(pdev, 1), | 4152 | ioremap_nocache(pci_resource_start(pdev, 1), |