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 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
brcm80211
/
brcmfmac
/
wl_cfg80211.c
diff --git
a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index
e4e326a
..
adf99be
100644
(file)
--- a/
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@
-2465,7
+2465,7
@@
static s32 brcmf_init_iscan(struct brcmf_cfg80211_priv *cfg_priv)
return err;
}
-static void brcmf_delay(u32 ms)
+static
__always_inline
void brcmf_delay(u32 ms)
{
if (ms < 1000 / HZ) {
cond_resched();