---

yaml --- r: 286207 b: refs/heads/master c: 5addc0d h: refs/heads/master i: 286205: ce57ed1 286203: d7fd7fd 286199: 91cccbd 286191: 9e9da90 286175: 9ae0370 286143: a9070ff 286079: 66f6503 285951: 010a208 285695: 6001b76 v: v3
git-mirror · Jan 17, 2012 · 9e886a4 · 9e886a4
1 parent 266dc62
commit 9e886a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e9e7fa414e47fccc6127f23bc866cbcc7e27dcb
+refs/heads/master: 5addc0de28f5e286f9d121112c4222250807b5a5
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -2475,7 +2475,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();