diff options
| author | Luciano Coelho <coelho@ti.com> | 2011-12-01 05:14:48 -0500 |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2011-12-01 05:14:48 -0500 |
| commit | e4da3fbfbd1de56d2367653e3823e6445e49f8a9 (patch) | |
| tree | f69f424f731b89a75f881967903ff2f38f4b6a92 /drivers/net/wireless/wl12xx/boot.c | |
| 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/boot.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/boot.c | 1 |
1 files changed, 1 insertions, 0 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 @@ | |||
| 23 | 23 | ||
| 24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
| 25 | #include <linux/wl12xx.h> | 25 | #include <linux/wl12xx.h> |
| 26 | #include <linux/export.h> | ||
| 26 | 27 | ||
| 27 | #include "debug.h" | 28 | #include "debug.h" |
| 28 | #include "acx.h" | 29 | #include "acx.h" |