diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-10-16 02:14:50 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-16 02:14:50 -0400 |
| commit | abeaf33a4101764291ec79cf286e08c0966eb26e (patch) | |
| tree | bb3f8ae60d1ff0d99a907bcc223886f9d71fafea /drivers/net/netxen/netxen_nic_main.c | |
| parent | 731ba3301de41d2ffae9dd3e0f85f7361d8ad8f4 (diff) | |
| parent | 52a94909f00e0ffceeac202e517a126d57c1c523 (diff) | |
Merge branch 'sh/stable-updates'
Conflicts:
arch/sh/mm/cache-sh4.c
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
| -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 9b9eab107704..7fc15e9e8adb 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
| @@ -595,7 +595,8 @@ netxen_setup_pci_map(struct netxen_adapter *adapter) | |||
| 595 | void __iomem *mem_ptr2 = NULL; | 595 | void __iomem *mem_ptr2 = NULL; |
| 596 | void __iomem *db_ptr = NULL; | 596 | void __iomem *db_ptr = NULL; |
| 597 | 597 | ||
| 598 | unsigned long mem_base, mem_len, db_base, db_len = 0, pci_len0 = 0; | 598 | resource_size_t mem_base, db_base; |
| 599 | unsigned long mem_len, db_len = 0, pci_len0 = 0; | ||
| 599 | 600 | ||
| 600 | struct pci_dev *pdev = adapter->pdev; | 601 | struct pci_dev *pdev = adapter->pdev; |
| 601 | int pci_func = adapter->ahw.pci_func; | 602 | int pci_func = adapter->ahw.pci_func; |