diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-03-08 16:48:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-08 16:48:51 +0100 |
| commit | dba58e39ced7af63f2748d12bbb2b4ac83c72391 (patch) | |
| tree | ee15a5e7667b51d0d0f7e8cb39064652f7c84c28 /drivers/net/wireless/arlan-main.c | |
| parent | tracing: trace_bprintk() cleanups (diff) | |
| parent | x86: implement atomic text_poke() via fixmap (diff) | |
| download | linux-dev-dba58e39ced7af63f2748d12bbb2b4ac83c72391.tar.xz linux-dev-dba58e39ced7af63f2748d12bbb2b4ac83c72391.zip | |
Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'tracing/textedit' into tracing/core
Diffstat (limited to 'drivers/net/wireless/arlan-main.c')
| -rw-r--r-- | drivers/net/wireless/arlan-main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c index bfca15da6f0f..14c11656e82c 100644 --- a/drivers/net/wireless/arlan-main.c +++ b/drivers/net/wireless/arlan-main.c @@ -1082,8 +1082,8 @@ static int __init arlan_probe_here(struct net_device *dev, if (arlan_check_fingerprint(memaddr)) return -ENODEV; - printk(KERN_NOTICE "%s: Arlan found at %x, \n ", dev->name, - (int) virt_to_phys((void*)memaddr)); + printk(KERN_NOTICE "%s: Arlan found at %llx, \n ", dev->name, + (u64) virt_to_phys((void*)memaddr)); ap->card = (void *) memaddr; dev->mem_start = memaddr; |