---

yaml --- r: 82639 b: refs/heads/master c: 06c3fd6 h: refs/heads/master i: 82637: d542a68 82635: 32e824f 82631: 81e662b 82623: 05d2810 v: v3
git-mirror · Feb 3, 2008 · cba52d5 · cba52d5
1 parent 8469475
commit cba52d5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e87ceea13e84a0748487ed0f9ccbfbc646966339
+refs/heads/master: 06c3fd6ad546f7e6e996ca1fc2cddd9c7aee8176
diff --git a/trunk/drivers/net/macb.c b/trunk/drivers/net/macb.c
@@ -1084,7 +1084,7 @@ static int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 	return phy_mii_ioctl(phydev, if_mii(rq), cmd);
 }
 
-static int __devinit macb_probe(struct platform_device *pdev)
+static int __init macb_probe(struct platform_device *pdev)
 {
 	struct eth_platform_data *pdata;
 	struct resource *regs;
@@ -1248,7 +1248,7 @@ static int __devinit macb_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int __devexit macb_remove(struct platform_device *pdev)
+static int __exit macb_remove(struct platform_device *pdev)
 {
 	struct net_device *dev;
 	struct macb *bp;
@@ -1276,16 +1276,15 @@ static int __devexit macb_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver macb_driver = {
-	.probe		= macb_probe,
-	.remove		= __devexit_p(macb_remove),
+	.remove		= __exit_p(macb_remove),
 	.driver		= {
 		.name		= "macb",
 	},
 };
 
 static int __init macb_init(void)
 {
-	return platform_driver_register(&macb_driver);
+	return platform_driver_probe(&macb_driver, macb_probe);
 }
 
 static void __exit macb_exit(void)