diff options
| author | David Sterba <dsterba@suse.cz> | 2008-07-28 10:52:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 11:28:03 -0400 |
| commit | 622e713e8e207a99aad956bf0ebe435420fb3742 (patch) | |
| tree | a56871b245bc67669055660ac6731938704b5b1f /drivers/char/pcmcia/ipwireless/main.c | |
| parent | 2fc5577e1729ac303ad8b9547f8ccdb057076998 (diff) | |
ipwireless: Glue splitted printk strings back
ipwireless: Glue splitted printk strings back
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/pcmcia/ipwireless/main.c')
| -rw-r--r-- | drivers/char/pcmcia/ipwireless/main.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c index cc7dcea2d283..6bdd11df4584 100644 --- a/drivers/char/pcmcia/ipwireless/main.c +++ b/drivers/char/pcmcia/ipwireless/main.c | |||
| @@ -311,14 +311,13 @@ static int config_ipwireless(struct ipw_dev *ipw) | |||
| 311 | (unsigned int) link->irq.AssignedIRQ); | 311 | (unsigned int) link->irq.AssignedIRQ); |
| 312 | if (ipw->attr_memory && ipw->common_memory) | 312 | if (ipw->attr_memory && ipw->common_memory) |
| 313 | printk(KERN_INFO IPWIRELESS_PCCARD_NAME | 313 | printk(KERN_INFO IPWIRELESS_PCCARD_NAME |
| 314 | ": attr memory 0x%08lx-0x%08lx, " | 314 | ": attr memory 0x%08lx-0x%08lx, common memory 0x%08lx-0x%08lx\n", |
| 315 | "common memory 0x%08lx-0x%08lx\n", | 315 | request_attr_memory.Base, |
| 316 | request_attr_memory.Base, | 316 | request_attr_memory.Base |
| 317 | request_attr_memory.Base | 317 | + request_attr_memory.Size - 1, |
| 318 | + request_attr_memory.Size - 1, | 318 | request_common_memory.Base, |
| 319 | request_common_memory.Base, | 319 | request_common_memory.Base |
| 320 | request_common_memory.Base | 320 | + request_common_memory.Size - 1); |
| 321 | + request_common_memory.Size - 1); | ||
| 322 | 321 | ||
| 323 | ipw->network = ipwireless_network_create(ipw->hardware); | 322 | ipw->network = ipwireless_network_create(ipw->hardware); |
| 324 | if (!ipw->network) | 323 | if (!ipw->network) |