From 9b2be67115c7870da16dac1b00528aa3d72bbba5 Mon Sep 17 00:00:00 2001 From: Jonas Bonn Date: Mon, 26 Jul 2010 18:45:05 -0700 Subject: [PATCH] --- yaml --- r: 203757 b: refs/heads/master c: f78f09f76540c9a986bc321a186a291f4bb40925 h: refs/heads/master i: 203755: c037aa68d30f7e910dbec202d55d39e3096b4da9 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethoc.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 446cdb1d417d..b1dd53f940fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08451e2587dc8d8c34cbbb8edc88a6e4fa8946e6 +refs/heads/master: f78f09f76540c9a986bc321a186a291f4bb40925 diff --git a/trunk/drivers/net/ethoc.c b/trunk/drivers/net/ethoc.c index 38c282e6565b..6d653c459c1f 100644 --- a/trunk/drivers/net/ethoc.c +++ b/trunk/drivers/net/ethoc.c @@ -632,7 +632,7 @@ static void ethoc_mdio_poll(struct net_device *dev) { } -static int ethoc_mdio_probe(struct net_device *dev) +static int __devinit ethoc_mdio_probe(struct net_device *dev) { struct ethoc *priv = netdev_priv(dev); struct phy_device *phy; @@ -871,7 +871,7 @@ static const struct net_device_ops ethoc_netdev_ops = { * ethoc_probe() - initialize OpenCores ethernet MAC * pdev: platform device */ -static int ethoc_probe(struct platform_device *pdev) +static int __devinit ethoc_probe(struct platform_device *pdev) { struct net_device *netdev = NULL; struct resource *res = NULL; @@ -1080,7 +1080,7 @@ static int ethoc_probe(struct platform_device *pdev) * ethoc_remove() - shutdown OpenCores ethernet MAC * @pdev: platform device */ -static int ethoc_remove(struct platform_device *pdev) +static int __devexit ethoc_remove(struct platform_device *pdev) { struct net_device *netdev = platform_get_drvdata(pdev); struct ethoc *priv = netdev_priv(netdev); @@ -1121,7 +1121,7 @@ static int ethoc_resume(struct platform_device *pdev) static struct platform_driver ethoc_driver = { .probe = ethoc_probe, - .remove = ethoc_remove, + .remove = __devexit_p(ethoc_remove), .suspend = ethoc_suspend, .resume = ethoc_resume, .driver = {