diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-06 13:31:19 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-06 13:31:19 -0500 |
| commit | 9e998a7550b41b303c5aa5351e66ccd56f2e4c50 (patch) | |
| tree | b39b57fa878f91fcbce65d923c1db03197ae28fc /drivers/net/wireless/wl12xx/spi.c | |
| parent | 73dbb5e1627a35c8ab81f3813c096e9e7aaabaaa (diff) | |
| parent | d39aeaf260e7d1ec6a677beed230a0406d0069a6 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-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 0f971867786..12421a64d89 100644 --- a/drivers/net/wireless/wl12xx/spi.c +++ b/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, }, |