diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-13 00:13:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-27 18:23:58 +0200 |
| commit | 7c7459d1f91abdf1e31ef80cad526e83e8b8ba4e (patch) | |
| tree | 032c2e1b947b36f2dced3090d3cdf757b147bce6 /drivers/net/8139cp.c | |
| parent | [PATCH] 64bit resource: fix up printks for resources in sound drivers (diff) | |
| download | linux-7c7459d1f91abdf1e31ef80cad526e83e8b8ba4e.tar.xz linux-7c7459d1f91abdf1e31ef80cad526e83e8b8ba4e.zip | |
[PATCH] 64bit resource: fix up printks for resources in networks drivers
This is needed if we wish to change the size of the resource structures.
Based on an original patch from Vivek Goyal <vgoyal@in.ibm.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net/8139cp.c')
| -rw-r--r-- | drivers/net/8139cp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index 0cdc830449d8..c1e1dc505138 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c @@ -1883,8 +1883,8 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) } if (pci_resource_len(pdev, 1) < CP_REGS_SIZE) { rc = -EIO; - printk(KERN_ERR PFX "MMIO resource (%lx) too small on pci dev %s\n", - pci_resource_len(pdev, 1), pci_name(pdev)); + printk(KERN_ERR PFX "MMIO resource (%llx) too small on pci dev %s\n", + (unsigned long long)pci_resource_len(pdev, 1), pci_name(pdev)); goto err_out_res; } @@ -1916,8 +1916,9 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) regs = ioremap(pciaddr, CP_REGS_SIZE); if (!regs) { rc = -EIO; - printk(KERN_ERR PFX "Cannot map PCI MMIO (%lx@%lx) on pci dev %s\n", - pci_resource_len(pdev, 1), pciaddr, pci_name(pdev)); + printk(KERN_ERR PFX "Cannot map PCI MMIO (%llx@%llx) on pci dev %s\n", + (unsigned long long)pci_resource_len(pdev, 1), + (unsigned long long)pciaddr, pci_name(pdev)); goto err_out_res; } dev->base_addr = (unsigned long) regs; |