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 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
[pandora-kernel.git]
/
drivers
/
net
/
hp-plus.c
diff --git
a/drivers/net/hp-plus.c
b/drivers/net/hp-plus.c
index
5e070f4
..
0486cbe
100644
(file)
--- a/
drivers/net/hp-plus.c
+++ b/
drivers/net/hp-plus.c
@@
-467,7
+467,7
@@
init_module(void)
if (this_dev != 0) break; /* only autoprobe 1st one */
printk(KERN_NOTICE "hp-plus.c: Presently autoprobing (not recommended) for a single card.\n");
}
- dev = alloc_ei_netdev();
+ dev = alloc_ei
p
_netdev();
if (!dev)
break;
dev->irq = irq[this_dev];