From 07f487363487a9e06105f221f16f4546ab599055 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 3 Dec 2012 09:23:16 -0500 Subject: [PATCH] --- yaml --- r: 341779 b: refs/heads/master c: 19d1b44aa8eba6304abdfe9761bb941f38b512f5 h: refs/heads/master i: 341777: 308fb073e11c2bcae9bde89a3110e23fea800549 341775: d193dc23c87c2bf6fd519adbb053ec38007e18dc v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/microchip/enc28j60.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 471e6ef81524..d1c2fbbe3cd0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f57e68488e27fb99bda29eb0c42b5450e439aa87 +refs/heads/master: 19d1b44aa8eba6304abdfe9761bb941f38b512f5 diff --git a/trunk/drivers/net/ethernet/microchip/enc28j60.c b/trunk/drivers/net/ethernet/microchip/enc28j60.c index 6118bdad244f..a99456c3dd87 100644 --- a/trunk/drivers/net/ethernet/microchip/enc28j60.c +++ b/trunk/drivers/net/ethernet/microchip/enc28j60.c @@ -1541,7 +1541,7 @@ static const struct net_device_ops enc28j60_netdev_ops = { .ndo_validate_addr = eth_validate_addr, }; -static int __devinit enc28j60_probe(struct spi_device *spi) +static int enc28j60_probe(struct spi_device *spi) { struct net_device *dev; struct enc28j60_net *priv; @@ -1617,7 +1617,7 @@ static int __devinit enc28j60_probe(struct spi_device *spi) return ret; } -static int __devexit enc28j60_remove(struct spi_device *spi) +static int enc28j60_remove(struct spi_device *spi) { struct enc28j60_net *priv = dev_get_drvdata(&spi->dev); @@ -1637,7 +1637,7 @@ static struct spi_driver enc28j60_driver = { .owner = THIS_MODULE, }, .probe = enc28j60_probe, - .remove = __devexit_p(enc28j60_remove), + .remove = enc28j60_remove, }; static int __init enc28j60_init(void)