|
@@ -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)
|