diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-26 15:03:48 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-26 15:03:48 -0400 |
| commit | d9b8ae6bd8c3304569a25079fcdbebaa28a48ee4 (patch) | |
| tree | 9ce3e4eb355685f970dd7333a0a935109aff0583 /drivers/net/wireless/libertas/firmware.c | |
| parent | 872f24dbc604ef585ea7eec73020dcdfaffd1956 (diff) | |
| parent | 94c514fe240fc0dd02187b78facefde8b6744634 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
Diffstat (limited to 'drivers/net/wireless/libertas/firmware.c')
| -rw-r--r-- | drivers/net/wireless/libertas/firmware.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/firmware.c b/drivers/net/wireless/libertas/firmware.c index cd23f1a8c98a..77f6504fd55d 100644 --- a/drivers/net/wireless/libertas/firmware.c +++ b/drivers/net/wireless/libertas/firmware.c | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #include <linux/firmware.h> | 5 | #include <linux/firmware.h> |
| 6 | #include <linux/firmware.h> | 6 | #include <linux/firmware.h> |
| 7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 8 | #include <linux/sched.h> | ||
| 8 | 9 | ||
| 9 | #include "dev.h" | 10 | #include "dev.h" |
| 10 | #include "decl.h" | 11 | #include "decl.h" |