summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBecky Bruce <bgill@freescale.com>2008-05-02 01:03:11 +0200
committerJeff Garzik <jgarzik@redhat.com>2008-05-22 12:19:32 +0200
commitf47e81fc36371a2f5e2b9792b6a8c56a4564ebbe (patch)
treeccafc82dd6bfe1bd6261f6da1b1e2ccb837c04e2
parentnet/usb: add support for Apple USB Ethernet Adapter (diff)
downloadlinux-f47e81fc36371a2f5e2b9792b6a8c56a4564ebbe.tar.xz
linux-f47e81fc36371a2f5e2b9792b6a8c56a4564ebbe.zip
e1000e: use resource_size_t, not unsigned long, for phys addrs
The use of unsigned long causes the driver to fail on 32-bit systems which support 64-bit resources. Signed-off-by: Becky Bruce <becky.bruce@freescale.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r--drivers/net/e1000e/netdev.c4
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;