---

yaml --- r: 341808 b: refs/heads/master c: 663e12e h: refs/heads/master v: v3
git-mirror · Dec 3, 2012 · 5721018 · 5721018
1 parent cd22752
commit 5721018
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 369158767af29ed54f3751f80222e751cf60236c
+refs/heads/master: 663e12e61d8764ce342588325d1050d9cb5460c0
diff --git a/trunk/drivers/net/ethernet/ti/cpsw.c b/trunk/drivers/net/ethernet/ti/cpsw.c
@@ -1136,7 +1136,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
 	return ret;
 }
 
-static int __devinit cpsw_probe(struct platform_device *pdev)
+static int cpsw_probe(struct platform_device *pdev)
 {
 	struct cpsw_platform_data	*data = pdev->dev.platform_data;
 	struct net_device		*ndev;
@@ -1398,7 +1398,7 @@ static int __devinit cpsw_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int __devexit cpsw_remove(struct platform_device *pdev)
+static int cpsw_remove(struct platform_device *pdev)
 {
 	struct net_device *ndev = platform_get_drvdata(pdev);
 	struct cpsw_priv *priv = netdev_priv(ndev);
@@ -1467,7 +1467,7 @@ static struct platform_driver cpsw_driver = {
 		.of_match_table = of_match_ptr(cpsw_of_mtable),
 	},
 	.probe = cpsw_probe,
-	.remove = __devexit_p(cpsw_remove),
+	.remove = cpsw_remove,
 };
 
 static int __init cpsw_init(void)