diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 13:48:32 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 13:48:32 +0900 |
| commit | ea88023b3491a384575ebcd5e8a449e841a28a24 (patch) | |
| tree | f46e3d8302e44dc55ce31823501e100472d29683 /drivers/net/hydra.c | |
| parent | a6f15ade97989d414e9bf33874c9d5d1f39808ec (diff) | |
| parent | 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/kernel/vmlinux.lds.S
Diffstat (limited to 'drivers/net/hydra.c')
| -rw-r--r-- | drivers/net/hydra.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c index 8ac0930c183..d496b6f4a47 100644 --- a/drivers/net/hydra.c +++ b/drivers/net/hydra.c @@ -173,9 +173,9 @@ static int __devinit hydra_init(struct zorro_dev *z) zorro_set_drvdata(z, dev); - printk(KERN_INFO "%s: Hydra at 0x%08lx, address " + printk(KERN_INFO "%s: Hydra at 0x%08llx, address " "%pM (hydra.c " HYDRA_VERSION ")\n", - dev->name, z->resource.start, dev->dev_addr); + dev->name, (unsigned long long)z->resource.start, dev->dev_addr); return 0; } |