diff options
-rw-r--r-- | drivers/net/natsemi.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 900ab5d2ba70..46119bb3770a 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -786,7 +786,8 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, | |||
786 | struct netdev_private *np; | 786 | struct netdev_private *np; |
787 | int i, option, irq, chip_idx = ent->driver_data; | 787 | int i, option, irq, chip_idx = ent->driver_data; |
788 | static int find_cnt = -1; | 788 | static int find_cnt = -1; |
789 | unsigned long iostart, iosize; | 789 | resource_size_t iostart; |
790 | unsigned long iosize; | ||
790 | void __iomem *ioaddr; | 791 | void __iomem *ioaddr; |
791 | const int pcibar = 1; /* PCI base address register */ | 792 | const int pcibar = 1; /* PCI base address register */ |
792 | int prev_eedata; | 793 | int prev_eedata; |
@@ -946,10 +947,11 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, | |||
946 | goto err_create_file; | 947 | goto err_create_file; |
947 | 948 | ||
948 | if (netif_msg_drv(np)) { | 949 | if (netif_msg_drv(np)) { |
949 | printk(KERN_INFO "natsemi %s: %s at %#08lx " | 950 | printk(KERN_INFO "natsemi %s: %s at %#08llx " |
950 | "(%s), %s, IRQ %d", | 951 | "(%s), %s, IRQ %d", |
951 | dev->name, natsemi_pci_info[chip_idx].name, iostart, | 952 | dev->name, natsemi_pci_info[chip_idx].name, |
952 | pci_name(np->pci_dev), print_mac(mac, dev->dev_addr), irq); | 953 | (unsigned long long)iostart, pci_name(np->pci_dev), |
954 | print_mac(mac, dev->dev_addr), irq); | ||
953 | if (dev->if_port == PORT_TP) | 955 | if (dev->if_port == PORT_TP) |
954 | printk(", port TP.\n"); | 956 | printk(", port TP.\n"); |
955 | else if (np->ignore_phy) | 957 | else if (np->ignore_phy) |