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 git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
[pandora-kernel.git]
/
drivers
/
net
/
hp100.c
diff --git
a/drivers/net/hp100.c
b/drivers/net/hp100.c
index
7dc5185
..
8caa591
100644
(file)
--- a/
drivers/net/hp100.c
+++ b/
drivers/net/hp100.c
@@
-1816,7
+1816,6
@@
static void hp100_rx(struct net_device *dev)
u_char *ptr;
skb_reserve(skb,2);
- skb->dev = dev;
/* ptr to start of the sk_buff data area */
skb_put(skb, pkt_len);
@@
-3006,7
+3005,7
@@
static int __init hp100_isa_init(void)
return cards > 0 ? 0 : -ENODEV;
}
-static void
__exit
hp100_isa_cleanup(void)
+static void hp100_isa_cleanup(void)
{
int i;