X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fnet%2Fhp100.c;h=8118a6750b614ded8ca7ca0365014d7776022406;hb=a54c545134ea77609ed9eb5df50524c097112327;hp=844c136e9920cc92c98d5abbb60c7a8a7767a14c;hpb=7d12e780e003f93433d49ce78cfedf4b4c52adc5;p=powerpc.git

diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index 844c136e99..8118a6750b 100644
--- 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);
@@ -3034,7 +3033,7 @@ static int __init hp100_module_init(void)
 		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