git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
drivers
/
staging
/
brcm80211
/
brcmsmac
/
mac80211_if.c
diff --git
a/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
b/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
index
84245b9
..
d6de44e
100644
(file)
--- a/
drivers/staging/brcm80211/brcmsmac/mac80211_if.c
+++ b/
drivers/staging/brcm80211/brcmsmac/mac80211_if.c
@@
-20,6
+20,7
@@
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/firmware.h>
+#include <linux/interrupt.h>
#include <net/mac80211.h>
#include <defs.h>
#include "nicpci.h"