git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
ipw2100.c
diff --git
a/drivers/net/wireless/ipw2100.c
b/drivers/net/wireless/ipw2100.c
index
1bcd352
..
dd9ba4a
100644
(file)
--- a/
drivers/net/wireless/ipw2100.c
+++ b/
drivers/net/wireless/ipw2100.c
@@
-6220,7
+6220,7
@@
static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
/* Allocate and initialize the Tx/Rx queues and lists */
if (ipw2100_queues_allocate(priv)) {
printk(KERN_WARNING DRV_NAME
- "Error cal
il
ng ipw2100_queues_allocate.\n");
+ "Error cal
li
ng ipw2100_queues_allocate.\n");
err = -ENOMEM;
goto fail;
}