From 47ddcf6c7e128d2951607dfa202382968d55d763 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Sat, 12 Apr 2008 20:58:30 +0400 Subject: [PATCH] --- yaml --- r: 90885 b: refs/heads/master c: 703bb99ca73aa38d3f200d4c7e9bb460dce35fda h: refs/heads/master i: 90883: 6013ed0dfb42da883a4f4e84e6446e06a7f61370 v: v3 --- [refs] | 2 +- trunk/drivers/net/natsemi.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c7da5a34a4aa..f7e07c514209 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 406874a7ccee927049b1c182df69457718b938da +refs/heads/master: 703bb99ca73aa38d3f200d4c7e9bb460dce35fda diff --git a/trunk/drivers/net/natsemi.c b/trunk/drivers/net/natsemi.c index 900ab5d2ba70..46119bb3770a 100644 --- a/trunk/drivers/net/natsemi.c +++ b/trunk/drivers/net/natsemi.c @@ -786,7 +786,8 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, struct netdev_private *np; int i, option, irq, chip_idx = ent->driver_data; static int find_cnt = -1; - unsigned long iostart, iosize; + resource_size_t iostart; + unsigned long iosize; void __iomem *ioaddr; const int pcibar = 1; /* PCI base address register */ int prev_eedata; @@ -946,10 +947,11 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, goto err_create_file; if (netif_msg_drv(np)) { - printk(KERN_INFO "natsemi %s: %s at %#08lx " + printk(KERN_INFO "natsemi %s: %s at %#08llx " "(%s), %s, IRQ %d", - dev->name, natsemi_pci_info[chip_idx].name, iostart, - pci_name(np->pci_dev), print_mac(mac, dev->dev_addr), irq); + dev->name, natsemi_pci_info[chip_idx].name, + (unsigned long long)iostart, pci_name(np->pci_dev), + print_mac(mac, dev->dev_addr), irq); if (dev->if_port == PORT_TP) printk(", port TP.\n"); else if (np->ignore_phy)