diff options
| author |   David Sterba <dsterba@suse.cz> | 2008-07-28 16:52:55 +0200 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 08:28:03 -0700 |
| commit | 622e713e8e207a99aad956bf0ebe435420fb3742 (patch) | |
| tree | a56871b245bc67669055660ac6731938704b5b1f /drivers/char/pcmcia/ipwireless/main.c | |
| parent | ipwireless: Remove pt_regs from interrupt handler (diff) | |
| download | linux-dev-622e713e8e207a99aad956bf0ebe435420fb3742.tar.xz linux-dev-622e713e8e207a99aad956bf0ebe435420fb3742.zip | |
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 '')
| -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) (unsigned int) link->irq.AssignedIRQ); if (ipw->attr_memory && ipw->common_memory) printk(KERN_INFO IPWIRELESS_PCCARD_NAME - ": attr memory 0x%08lx-0x%08lx, " - "common memory 0x%08lx-0x%08lx\n", - request_attr_memory.Base, - request_attr_memory.Base - + request_attr_memory.Size - 1, - request_common_memory.Base, - request_common_memory.Base - + request_common_memory.Size - 1); + ": attr memory 0x%08lx-0x%08lx, common memory 0x%08lx-0x%08lx\n", + request_attr_memory.Base, + request_attr_memory.Base + + request_attr_memory.Size - 1, + request_common_memory.Base, + request_common_memory.Base + + request_common_memory.Size - 1); ipw->network = ipwireless_network_create(ipw->hardware); if (!ipw->network) |