From 9fc0dd5e55bafec991ab2e4ce0b1f58bb440911a Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Thu, 12 Jun 2008 21:36:24 -0700
Subject: [PATCH] --- yaml --- r: 98243 b: refs/heads/master c:
 6fd65882f5e99972ba96f7cc92086ebac041cdf8 h: refs/heads/master i:   98241:
 40d151f3cc483a7e5501b89ef3efc8b17c8f437c   98239:
 336b5fc8dd82e731986b2960eb98c8a4132b7eb4 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/net/enc28j60.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

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),
 };