From 5721018c134c53ca1c40d3e794494f7df481ddd8 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 3 Dec 2012 09:23:45 -0500 Subject: [PATCH] --- yaml --- r: 341808 b: refs/heads/master c: 663e12e61d8764ce342588325d1050d9cb5460c0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/ti/cpsw.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9d9fb032ba25..19508e5891ce 100644 --- 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 index c9714e1c164a..40aff684aa23 100644 --- 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)