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 | |
| parent | b693289406f0b8ca70ab77e745be6196d5740eb0 (diff) | |
| parent | ba5736a5e9ac20c378ae4179e8a0ed3cc4b44351 (diff) | |
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')
| -rw-r--r-- | drivers/net/wireless/wl12xx/boot.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/wl12xx/scan.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/wl12xx/spi.c | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/boot.c b/drivers/net/wireless/wl12xx/boot.c index 4ce634b925cb..6e140bf4e236 100644 --- a/drivers/net/wireless/wl12xx/boot.c +++ b/drivers/net/wireless/wl12xx/boot.c @@ -23,6 +23,7 @@ #include <linux/slab.h> #include <linux/wl12xx.h> +#include <linux/export.h> #include "debug.h" #include "acx.h" diff --git a/drivers/net/wireless/wl12xx/scan.c b/drivers/net/wireless/wl12xx/scan.c index a13c49e27a36..330d6788a916 100644 --- a/drivers/net/wireless/wl12xx/scan.c +++ b/drivers/net/wireless/wl12xx/scan.c @@ -581,7 +581,7 @@ wl12xx_scan_sched_scan_ssid_list(struct wl1271 *wl, break; } /* Fail if SSID isn't present in the filters */ - if (j == req->n_ssids) { + if (j == cmd->n_ssids) { ret = -EINVAL; goto out_free; } diff --git a/drivers/net/wireless/wl12xx/spi.c b/drivers/net/wireless/wl12xx/spi.c index 9e6f7fa0f9a3..92caa7ce6053 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, }, |