---

yaml --- r: 341758 b: refs/heads/master c: c0c0e29 h: refs/heads/master v: v3
git-mirror · Dec 3, 2012 · 25a07e8 · 25a07e8
1 parent 0979c2d
commit 25a07e8
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: 49f7315b3ece7900cbe763da2af67928fbdf6d55
+refs/heads/master: c0c0e29d8c94fb483bf94a2157f1ef0a7fb70b55
diff --git a/trunk/drivers/net/ethernet/aeroflex/greth.c b/trunk/drivers/net/ethernet/aeroflex/greth.c
@@ -1376,7 +1376,7 @@ static int greth_mdio_init(struct greth_private *greth)
 }
 
 /* Initialize the GRETH MAC */
-static int __devinit greth_of_probe(struct platform_device *ofdev)
+static int greth_of_probe(struct platform_device *ofdev)
 {
 	struct net_device *dev;
 	struct greth_private *greth;
@@ -1576,7 +1576,7 @@ static int __devinit greth_of_probe(struct platform_device *ofdev)
 	return err;
 }
 
-static int __devexit greth_of_remove(struct platform_device *of_dev)
+static int greth_of_remove(struct platform_device *of_dev)
 {
 	struct net_device *ndev = dev_get_drvdata(&of_dev->dev);
 	struct greth_private *greth = netdev_priv(ndev);
@@ -1619,7 +1619,7 @@ static struct platform_driver greth_of_driver = {
 		.of_match_table = greth_of_match,
 	},
 	.probe = greth_of_probe,
-	.remove = __devexit_p(greth_of_remove),
+	.remove = greth_of_remove,
 };
 
 module_platform_driver(greth_of_driver);