diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-03 17:43:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-03 17:43:30 -0400 |
| commit | fca1287a3a9246d4facc27a0a455fada18fd1164 (patch) | |
| tree | 62aad7dcd377e9670f694077c5facc76ffd85969 /drivers/net/netxen | |
| parent | 437cf2f1c5f05e34510f43e129af29a716b04ce6 (diff) | |
| parent | 0b62afb432d807482a6808508112d1baf29f3798 (diff) | |
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/netxen')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 32bb47adbe39..008fd6618a5f 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
| @@ -359,16 +359,6 @@ static void netxen_pcie_strap_init(struct netxen_adapter *adapter) | |||
| 359 | int i, pos; | 359 | int i, pos; |
| 360 | struct pci_dev *pdev; | 360 | struct pci_dev *pdev; |
| 361 | 361 | ||
| 362 | pdev = pci_get_device(0x1166, 0x0140, NULL); | ||
| 363 | if (pdev) { | ||
| 364 | pci_dev_put(pdev); | ||
| 365 | adapter->hw_read_wx(adapter, | ||
| 366 | NETXEN_PCIE_REG(PCIE_TGT_SPLIT_CHICKEN), &chicken, 4); | ||
| 367 | chicken |= 0x4000; | ||
| 368 | adapter->hw_write_wx(adapter, | ||
| 369 | NETXEN_PCIE_REG(PCIE_TGT_SPLIT_CHICKEN), &chicken, 4); | ||
| 370 | } | ||
| 371 | |||
| 372 | pdev = adapter->pdev; | 362 | pdev = adapter->pdev; |
| 373 | 363 | ||
| 374 | adapter->hw_read_wx(adapter, | 364 | adapter->hw_read_wx(adapter, |