diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
| commit | b242a60206881559bb3102110048762422e6b74e (patch) | |
| tree | 86459efa47b9c3f69d865b4495beede9c4184003 /drivers/net/wireless/netwave_cs.c | |
| parent | e1fd18656c2963e383d67b7006c0e06c9c1d9c79 (diff) | |
| parent | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/net/wireless/netwave_cs.c')
| -rw-r--r-- | drivers/net/wireless/netwave_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index 2402cb8dd328..d2fa079fbc4c 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c | |||
| @@ -806,7 +806,7 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) { | |||
| 806 | for (i = 0; i < 6; i++) | 806 | for (i = 0; i < 6; i++) |
| 807 | dev->dev_addr[i] = readb(ramBase + NETWAVE_EREG_PA + i); | 807 | dev->dev_addr[i] = readb(ramBase + NETWAVE_EREG_PA + i); |
| 808 | 808 | ||
| 809 | printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx" | 809 | printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx, " |
| 810 | "id %c%c, hw_addr %s\n", | 810 | "id %c%c, hw_addr %s\n", |
| 811 | dev->name, dev->base_addr, dev->irq, | 811 | dev->name, dev->base_addr, dev->irq, |
| 812 | (u_long) ramBase, | 812 | (u_long) ramBase, |