diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 16:32:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 16:32:16 -0700 |
| commit | dd4a59a8e5dd44299b2df4411e8d7b05902ef2e7 (patch) | |
| tree | a87bfbde61f392bfff25b2d0fb9842460a0b7ad7 /drivers/net/8139cp.c | |
| parent | 155dbfd8846bf165bb036c4492ad121c8b059f1d (diff) | |
| parent | 22e1170310ec6afa41e0dc7ac9dfac735d82dcab (diff) | |
| download | lwn-dd4a59a8e5dd44299b2df4411e8d7b05902ef2e7.tar.gz lwn-dd4a59a8e5dd44299b2df4411e8d7b05902ef2e7.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
[PATCH] sky2: optimize receive restart
[PATCH] sky2: PHY power on delays
[PATCH] sky2: NAPI suspend/resume of dual port cards
[PATCH] sky2: sky2_reset section mismatch
[PATCH] sk98lin: fix truncated collision threshold mask
[PATCH] skge: fix truncated collision threshold mask
[PATCH] sky2: fix truncated collision threshold mask
[PATCH] myri10ge return value fix
[PATCH] Update smc91x driver with ARM Versatile board info
[PATCH] ixgb: fix tx unit hang - properly calculate desciptor count
[PATCH] smsc-ircc2: fix section reference mismatches
[PATCH] 8139cp.c printk fix
[PATCH] s2io driver irq fix
[PATCH] e1000: irq naming update
[PATCH] forcedeth: watermark fixup
[PATCH] forcedeth: deferral fixup
[PATCH] zd1211rw: usb_clear_halt not allowed in IRQ context
[PATCH] bcm43xx-softmac: Fix an off-by-one condition in handle_irq_noise
Diffstat (limited to 'drivers/net/8139cp.c')
| -rw-r--r-- | drivers/net/8139cp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index d2150baa7e35..1428bb7715af 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c @@ -1916,7 +1916,7 @@ 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; - dev_err(&pdev->dev, "Cannot map PCI MMIO (%lx@%lx)\n", + dev_err(&pdev->dev, "Cannot map PCI MMIO (%Lx@%Lx)\n", (unsigned long long)pci_resource_len(pdev, 1), (unsigned long long)pciaddr); goto err_out_res; |