projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pasemi_mac: Fix register defines
[powerpc.git]
/
drivers
/
net
/
hp100.c
diff --git
a/drivers/net/hp100.c
b/drivers/net/hp100.c
index
844c136
..
8118a67
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);
u_char *ptr;
skb_reserve(skb,2);
- skb->dev = dev;
/* ptr to start of the sk_buff data area */
skb_put(skb, pkt_len);
/* ptr to start of the sk_buff data area */
skb_put(skb, pkt_len);
@@
-3034,7
+3033,7
@@
static int __init hp100_module_init(void)
goto out2;
#endif
#ifdef CONFIG_PCI
goto out2;
#endif
#ifdef CONFIG_PCI
- err = pci_
module_init
(&hp100_pci_driver);
+ err = pci_
register_driver
(&hp100_pci_driver);
if (err && err != -ENODEV)
goto out3;
#endif
if (err && err != -ENODEV)
goto out3;
#endif