From 3c6b66992ca0a275ba117554a725dd6fb7d3cb0c Mon Sep 17 00:00:00 2001
From: Henry Ptasinski <henryp@broadcom.com>
Date: Thu, 7 Oct 2010 19:52:05 -0700
Subject: [PATCH] --- yaml --- r: 220171 b: refs/heads/master c:
 d953a05d04b17b43f3bf4a183131e5c5e223ecaa h: refs/heads/master i:   220169:
 3d3e4f2187cc4e15d8001b64043f728ac8fffd91   220167:
 832fdbb5fc3b3340559da207f9690c8051af6879 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/staging/brcm80211/phy/wlc_phy_lcn.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4485d36a1d84..a4cd6b8fe77b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86566325d398409637fe920181306d43f5980541
+refs/heads/master: d953a05d04b17b43f3bf4a183131e5c5e223ecaa
diff --git a/trunk/drivers/staging/brcm80211/phy/wlc_phy_lcn.c b/trunk/drivers/staging/brcm80211/phy/wlc_phy_lcn.c
index 6b8749a10a50..1b90f79eaa57 100644
--- a/trunk/drivers/staging/brcm80211/phy/wlc_phy_lcn.c
+++ b/trunk/drivers/staging/brcm80211/phy/wlc_phy_lcn.c
@@ -21,7 +21,7 @@
 #include <linux/string.h>
 #include <linuxver.h>
 #include <siutils.h>
-#include <bitfuncs.h>
+#include <linux/bitops.h>
 #include <hndpmu.h>
 
 #include <wlc_phy_radio.h>
@@ -5196,7 +5196,7 @@ int32 wlc_lcnphy_rx_signal_power(phy_info_t *pi, int32 gain_index)
 	{
 		uint32 power = (received_power * 16);
 		uint32 msb1, msb2, val1, val2, diff1, diff2;
-		msb1 = find_msbit(power);
+		msb1 = ffs(power) - 1;
 		msb2 = msb1 + 1;
 		val1 = 1 << msb1;
 		val2 = 1 << msb2;