diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-06 10:44:14 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-06 10:45:01 -0500 |
| commit | f0ef03985130287c6c84ebe69416cf790e6cc00e (patch) | |
| tree | 3ecb04cc4d82e5fc3ae5f1747e6da172ae8cbcb7 /drivers/net/wireless/arlan-main.c | |
| parent | 16097439703bcd38e9fe5608c12add6dacb825ea (diff) | |
| parent | 31bbed527e7039203920c51c9fb48c27aed0820c (diff) | |
Merge branch 'x86/core' into tracing/textedit
Conflicts:
arch/x86/Kconfig
block/blktrace.c
kernel/irq/handle.c
Semantic conflict:
kernel/trace/blktrace.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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, | |||
| 1082 | if (arlan_check_fingerprint(memaddr)) | 1082 | if (arlan_check_fingerprint(memaddr)) |
| 1083 | return -ENODEV; | 1083 | return -ENODEV; |
| 1084 | 1084 | ||
| 1085 | printk(KERN_NOTICE "%s: Arlan found at %x, \n ", dev->name, | 1085 | printk(KERN_NOTICE "%s: Arlan found at %llx, \n ", dev->name, |
| 1086 | (int) virt_to_phys((void*)memaddr)); | 1086 | (u64) virt_to_phys((void*)memaddr)); |
| 1087 | 1087 | ||
| 1088 | ap->card = (void *) memaddr; | 1088 | ap->card = (void *) memaddr; |
| 1089 | dev->mem_start = memaddr; | 1089 | dev->mem_start = memaddr; |