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 'master' into next
[pandora-kernel.git]
/
drivers
/
net
/
hp-plus.c
diff --git
a/drivers/net/hp-plus.c
b/drivers/net/hp-plus.c
index
fbbd3e6
..
c01e290
100644
(file)
--- a/
drivers/net/hp-plus.c
+++ b/
drivers/net/hp-plus.c
@@
-230,7
+230,7
@@
static int __init hpp_probe1(struct net_device *dev, int ioaddr)
dev->open = &hpp_open;
dev->stop = &hpp_close;
#ifdef CONFIG_NET_POLL_CONTROLLER
- dev->poll_controller = ei_poll;
+ dev->poll_controller = ei
p
_poll;
#endif
ei_status.name = name;