diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-13 15:55:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-13 15:55:20 -0400 |
| commit | 421355de876b9f3fcc7e4cb6026e416fb12a5068 (patch) | |
| tree | fb814456af86c75e1eb9e330994dda461fc5b4f7 /drivers/net/netxen | |
| parent | aace495933a981274b6491d71b915165a61defdc (diff) | |
| parent | 0fe7463a35aadfaf22d1ca58325ab3851b8d757c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/netxen')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index ecbadc5e289..5bc8520e3e1 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
| @@ -597,7 +597,8 @@ netxen_setup_pci_map(struct netxen_adapter *adapter) | |||
| 597 | void __iomem *mem_ptr2 = NULL; | 597 | void __iomem *mem_ptr2 = NULL; |
| 598 | void __iomem *db_ptr = NULL; | 598 | void __iomem *db_ptr = NULL; |
| 599 | 599 | ||
| 600 | unsigned long mem_base, mem_len, db_base, db_len = 0, pci_len0 = 0; | 600 | resource_size_t mem_base, db_base; |
| 601 | unsigned long mem_len, db_len = 0, pci_len0 = 0; | ||
| 601 | 602 | ||
| 602 | struct pci_dev *pdev = adapter->pdev; | 603 | struct pci_dev *pdev = adapter->pdev; |
| 603 | int pci_func = adapter->ahw.pci_func; | 604 | int pci_func = adapter->ahw.pci_func; |