diff options
| author | Luciano Coelho <coelho@ti.com> | 2011-12-01 12:14:48 +0200 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-12-01 12:14:48 +0200 |
| commit | e4da3fbfbd1de56d2367653e3823e6445e49f8a9 (patch) | |
| tree | f69f424f731b89a75f881967903ff2f38f4b6a92 /drivers/net/wireless/wl12xx/spi.c | |
| parent | b693289406f0b8ca70ab77e745be6196d5740eb0 (diff) | |
| parent | ba5736a5e9ac20c378ae4179e8a0ed3cc4b44351 (diff) | |
| download | op-kernel-dev-e4da3fbfbd1de56d2367653e3823e6445e49f8a9.zip op-kernel-dev-e4da3fbfbd1de56d2367653e3823e6445e49f8a9.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next
Diffstat (limited to 'drivers/net/wireless/wl12xx/spi.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/spi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/spi.c b/drivers/net/wireless/wl12xx/spi.c index 9e6f7fa..92caa7c 100644 --- a/drivers/net/wireless/wl12xx/spi.c +++ b/drivers/net/wireless/wl12xx/spi.c @@ -410,7 +410,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, }, |
