diff options
| author |   David S. Miller <davem@davemloft.net> | 2008-05-23 00:05:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-23 00:05:14 -0700 |
| commit | 7bece8155be133cd67c41eed2b31c60a310609de (patch) | |
| tree | 906a62dcf10c1f2e6c1188a2b6e386668fcd9fe3 /drivers/net/e1000e/netdev.c | |
| parent | netlink: Fix nla_parse_nested_compat() to call nla_parse() directly (diff) | |
| parent | fmvj18x_cs: add NextCom NC5310 rev B support (diff) | |
| download | linux-dev-7bece8155be133cd67c41eed2b31c60a310609de.tar.xz linux-dev-7bece8155be133cd67c41eed2b31c60a310609de.zip | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 8cbb40f3a506..cab1835173cd 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -4201,8 +4201,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev, struct e1000_adapter *adapter; struct e1000_hw *hw; const struct e1000_info *ei = e1000_info_tbl[ent->driver_data]; - unsigned long mmio_start, mmio_len; - unsigned long flash_start, flash_len; + resource_size_t mmio_start, mmio_len; + resource_size_t flash_start, flash_len; static int cards_found; int i, err, pci_using_dac; |