The patch titled
dm9000: add __devinit and __devexit attributes to probe and remove
has been removed from the -mm tree. Its filename was
dm9000-add-__devinit-and-__devexit-attributes-to-probe-and-remove.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: dm9000: add __devinit and __devexit attributes to probe and remove
From: Enrico Scholz <enrico.scholz@xxxxxxxxxxxxxxxxx>
There were missing __dev* annotations for the dm9000_probe() and
dm9000_drv_remove() functions.
Signed-off-by: Enrico Scholz <enrico.scholz@xxxxxxxxxxxxxxxxx>
Signed-off-by: Ben Dooks <ben-linux@xxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/dm9000.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/net/dm9000.c~dm9000-add-__devinit-and-__devexit-attributes-to-probe-and-remove drivers/net/dm9000.c
--- a/drivers/net/dm9000.c~dm9000-add-__devinit-and-__devexit-attributes-to-probe-and-remove
+++ a/drivers/net/dm9000.c
@@ -503,7 +503,7 @@ dm9000_release_board(struct platform_dev
/*
* Search DM9000 board, allocate space and register it
*/
-static int
+static int __devinit
dm9000_probe(struct platform_device *pdev)
{
struct dm9000_plat_data *pdata = pdev->dev.platform_data;
@@ -1372,7 +1372,7 @@ dm9000_drv_resume(struct platform_device
return 0;
}
-static int
+static int __devexit
dm9000_drv_remove(struct platform_device *pdev)
{
struct net_device *ndev = platform_get_drvdata(pdev);
@@ -1393,7 +1393,7 @@ static struct platform_driver dm9000_dri
.owner = THIS_MODULE,
},
.probe = dm9000_probe,
- .remove = dm9000_drv_remove,
+ .remove = __devexit_p(dm9000_drv_remove),
.suspend = dm9000_drv_suspend,
.resume = dm9000_drv_resume,
};
_
Patches currently in -mm which might be from enrico.scholz@xxxxxxxxxxxxxxxxx are
git-net.patch
dm9000-use-delayed-work-to-update-mii-phy-state-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
