From 9e886a4ae99180ccd4d9d29c75c164d16c64d3c0 Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
Date: Mon, 16 Jan 2012 14:00:12 -0500
Subject: [PATCH] --- yaml --- r: 286207 b: refs/heads/master c:
 5addc0de28f5e286f9d121112c4222250807b5a5 h: refs/heads/master i:   286205:
 ce57ed143e1e48a8075e130c3e6a7e2503a1a6b8   286203:
 d7fd7fda2110d2681b229e1f68e37c763f491352   286199:
 91cccbd37fcafc60ad812c85511dac372953e029   286191:
 9e9da90685c305baf25461767d225daa8f0d03ca   286175:
 9ae037049bb8fd3d58fb5722513c9572b2073487   286143:
 a9070ff13df66de39faf3d3b991ef79d6a9f62cd   286079:
 66f650379fed8058873d7564c28393bdaaa6d828   285951:
 010a20829a6859ecc11c33b688d0d0a9ecadf557   285695:
 6001b761057945ffc3242ced19de3ca9da3d8a2f v: v3

---
 [refs]                                                      | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 430fa90149b8..11f1e3b6a299 100644
--- 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
index f23b0c3e4ea3..bf11850a20f1 100644
--- 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();