---

yaml --- r: 249339 b: refs/heads/master c: 652dfad h: refs/heads/master i: 249337: e025875 249335: 6b6a7ef v: v3
git-mirror · May 3, 2011 · 250b22d · 250b22d
1 parent f9b00d7
commit 250b22d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 085a5cf16299e139672e51f9cf9e605b5b294af2
+refs/heads/master: 652dfad2dc8ff6daa976585d91de4f26ea3a3a2c
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/Makefile b/trunk/drivers/staging/brcm80211/brcmsmac/Makefile
@@ -47,13 +47,13 @@ BRCMSMAC_OFILES := \
 	phy/wlc_phy_n.o \
 	phy/wlc_phytbl_lcn.o \
 	phy/wlc_phytbl_n.o \
+	phy/wlc_phy_qmath.o \
 	../util/bcmutils.o \
 	../util/bcmwifi.o \
 	../util/bcmotp.o \
 	../util/bcmsrom.o \
 	../util/hnddma.o \
 	../util/nicpci.o \
-	../util/qmath.o \
 	../util/nvram/nvram_ro.o
 
 MODULEPFX := brcmsmac

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
@@ -19,18 +19,18 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <wlc_cfg.h>
-#include <qmath.h>
 #include <linux/pci.h>
 #include <aiutils.h>
 #include <wlc_pmu.h>
 
 #include <bcmdevs.h>
 #include <sbhnddma.h>
 
-#include <wlc_phy_radio.h>
-#include <wlc_phy_int.h>
-#include <wlc_phy_lcn.h>
-#include <wlc_phytbl_lcn.h>
+#include "wlc_phy_radio.h"
+#include "wlc_phy_int.h"
+#include "wlc_phy_qmath.h"
+#include "wlc_phy_lcn.h"
+#include "wlc_phytbl_lcn.h"
 
 #define PLL_2064_NDIV		90
 #define PLL_2064_LOW_END_VCO 	3000

diff --git a/trunk/drivers/staging/brcm80211/util/qmath.c → ...ng/brcm80211/brcmsmac/phy/wlc_phy_qmath.c b/trunk/drivers/staging/brcm80211/util/qmath.c → ...ng/brcm80211/brcmsmac/phy/wlc_phy_qmath.c
@@ -15,7 +15,8 @@
  */
 
 #include <linux/types.h>
-#include "qmath.h"
+
+#include "wlc_phy_qmath.h"
 
 /*
 Description: This function saturate input 32 bit number into a 16 bit number.

diff --git a/...drivers/staging/brcm80211/include/qmath.h → ...ng/brcm80211/brcmsmac/phy/wlc_phy_qmath.h b/...drivers/staging/brcm80211/include/qmath.h → ...ng/brcm80211/brcmsmac/phy/wlc_phy_qmath.h