diff --git a/[refs] b/[refs] index 234a53a73c25..617cff6d4ef5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3b4fcedee5cf1d1342b85f1318c0fe1ff1727a9 +refs/heads/master: 6fd65882f5e99972ba96f7cc92086ebac041cdf8 diff --git a/trunk/drivers/net/enc28j60.c b/trunk/drivers/net/enc28j60.c index 46a90e9ec563..0f1581cbd101 100644 --- a/trunk/drivers/net/enc28j60.c +++ b/trunk/drivers/net/enc28j60.c @@ -1556,7 +1556,7 @@ static int __devinit enc28j60_probe(struct spi_device *spi) return ret; } -static int enc28j60_remove(struct spi_device *spi) +static int __devexit enc28j60_remove(struct spi_device *spi) { struct enc28j60_net *priv = dev_get_drvdata(&spi->dev); @@ -1573,9 +1573,8 @@ static int enc28j60_remove(struct spi_device *spi) static struct spi_driver enc28j60_driver = { .driver = { .name = DRV_NAME, - .bus = &spi_bus_type, .owner = THIS_MODULE, - }, + }, .probe = enc28j60_probe, .remove = __devexit_p(enc28j60_remove), };