From cba52d5de4247e9af67cfe6c106d19821549bcd9 Mon Sep 17 00:00:00 2001
From: Haavard Skinnemoen <hskinnemoen@atmel.com>
Date: Thu, 31 Jan 2008 13:10:22 +0100
Subject: [PATCH] --- yaml --- r: 82639 b: refs/heads/master c:
 06c3fd6ad546f7e6e996ca1fc2cddd9c7aee8176 h: refs/heads/master i:   82637:
 d542a68ca5b70922af831c94dbec00ea96d60ff4   82635:
 32e824f15b3d3026365218ac84d0bd441c05d9c4   82631:
 81e662b4e5fa950d114d18e7f1a7e216144315b4   82623:
 05d2810c3740b0a1f1f601ef04a8e53276e4041b v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/macb.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 404dc445cf5c..1ef823d2e64b 100644
--- 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
index e10528ed9081..81bf005ff280 100644
--- 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,8 +1276,7 @@ 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",
 	},
@@ -1285,7 +1284,7 @@ static struct platform_driver macb_driver = {
 
 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)