From c2a49b7ceb3d71cc6b5957dfd64a92b15b3e2558 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Thu, 24 Nov 2011 16:29:20 +0100
Subject: [PATCH] --- yaml --- r: 278419 b: refs/heads/master c:
 4e3309ba95f0d642efacfcb972251b07c3d29c27 h: refs/heads/master i:   278417:
 e4fafa092e2ade680eb11a1fe39658dfcc2b2e7d   278415:
 95f0fb5f07bce6632fa4d64ba04a46a2a9f7fc27 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/libertas/if_spi.c | 1 -
 trunk/drivers/net/wireless/p54/p54spi.c      | 1 -
 trunk/drivers/net/wireless/wl1251/spi.c      | 1 -
 trunk/drivers/net/wireless/wl12xx/spi.c      | 1 -
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e12b5a2b77e5..37eab47f7c41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5220da39b4f6bd2ee69d298111ebebc0de886f2f
+refs/heads/master: 4e3309ba95f0d642efacfcb972251b07c3d29c27
diff --git a/trunk/drivers/net/wireless/libertas/if_spi.c b/trunk/drivers/net/wireless/libertas/if_spi.c
index 11b69b300dc0..0c87f42fa660 100644
--- a/trunk/drivers/net/wireless/libertas/if_spi.c
+++ b/trunk/drivers/net/wireless/libertas/if_spi.c
@@ -1290,7 +1290,6 @@ static struct spi_driver libertas_spi_driver = {
 	.remove = __devexit_p(libertas_spi_remove),
 	.driver = {
 		.name	= "libertas_spi",
-		.bus	= &spi_bus_type,
 		.owner	= THIS_MODULE,
 		.pm	= &if_spi_pm_ops,
 	},
diff --git a/trunk/drivers/net/wireless/p54/p54spi.c b/trunk/drivers/net/wireless/p54/p54spi.c
index a454d487b14f..546551389a1d 100644
--- a/trunk/drivers/net/wireless/p54/p54spi.c
+++ b/trunk/drivers/net/wireless/p54/p54spi.c
@@ -699,7 +699,6 @@ static int __devexit p54spi_remove(struct spi_device *spi)
 static struct spi_driver p54spi_driver = {
 	.driver = {
 		.name		= "p54spi",
-		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,
 	},
 
diff --git a/trunk/drivers/net/wireless/wl1251/spi.c b/trunk/drivers/net/wireless/wl1251/spi.c
index eaa5f9556200..6248c354fc5c 100644
--- a/trunk/drivers/net/wireless/wl1251/spi.c
+++ b/trunk/drivers/net/wireless/wl1251/spi.c
@@ -319,7 +319,6 @@ static int __devexit wl1251_spi_remove(struct spi_device *spi)
 static struct spi_driver wl1251_spi_driver = {
 	.driver = {
 		.name		= DRIVER_NAME,
-		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,
 	},
 
diff --git a/trunk/drivers/net/wireless/wl12xx/spi.c b/trunk/drivers/net/wireless/wl12xx/spi.c
index 0f9718677860..12421a64d891 100644
--- a/trunk/drivers/net/wireless/wl12xx/spi.c
+++ b/trunk/drivers/net/wireless/wl12xx/spi.c
@@ -462,7 +462,6 @@ static int __devexit wl1271_remove(struct spi_device *spi)
 static struct spi_driver wl1271_spi_driver = {
 	.driver = {
 		.name		= "wl1271_spi",
-		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,
 	},