From 6000e97aae45e04dce380959dbd92e6022d8bcb7 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 3 Dec 2012 09:23:51 -0500 Subject: [PATCH] --- yaml --- r: 341814 b: refs/heads/master c: 9871b639d00b75625a4bc855c09096e2c4897816 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/xscale/ixp4xx_eth.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 74b6351c1864..5f78c7358b47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48d16cb1befb39ab1d7dc5842182d6133d88de0e +refs/heads/master: 9871b639d00b75625a4bc855c09096e2c4897816 diff --git a/trunk/drivers/net/ethernet/xscale/ixp4xx_eth.c b/trunk/drivers/net/ethernet/xscale/ixp4xx_eth.c index 477d6729b17f..d3ebb73277be 100644 --- a/trunk/drivers/net/ethernet/xscale/ixp4xx_eth.c +++ b/trunk/drivers/net/ethernet/xscale/ixp4xx_eth.c @@ -1379,7 +1379,7 @@ static const struct net_device_ops ixp4xx_netdev_ops = { .ndo_validate_addr = eth_validate_addr, }; -static int __devinit eth_init_one(struct platform_device *pdev) +static int eth_init_one(struct platform_device *pdev) { struct port *port; struct net_device *dev; @@ -1480,7 +1480,7 @@ static int __devinit eth_init_one(struct platform_device *pdev) return err; } -static int __devexit eth_remove_one(struct platform_device *pdev) +static int eth_remove_one(struct platform_device *pdev) { struct net_device *dev = platform_get_drvdata(pdev); struct port *port = netdev_priv(dev);