From 250b22d342b240b602287e54f40c39115c0eb4d8 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Tue, 3 May 2011 11:35:56 +0200
Subject: [PATCH] --- yaml --- r: 249339 b: refs/heads/master c:
 652dfad2dc8ff6daa976585d91de4f26ea3a3a2c h: refs/heads/master i:   249337:
 e025875a7d019c1840a88047ad6d6a43aa3faae0   249335:
 6b6a7efdf98043fa0deef254777ea5f26248e312 v: v3

---
 [refs]                                                 |  2 +-
 trunk/drivers/staging/brcm80211/brcmsmac/Makefile      |  2 +-
 .../staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c       | 10 +++++-----
 .../{util/qmath.c => brcmsmac/phy/wlc_phy_qmath.c}     |  3 ++-
 .../{include/qmath.h => brcmsmac/phy/wlc_phy_qmath.h}  |  0
 5 files changed, 9 insertions(+), 8 deletions(-)
 rename trunk/drivers/staging/brcm80211/{util/qmath.c => brcmsmac/phy/wlc_phy_qmath.c} (99%)
 rename trunk/drivers/staging/brcm80211/{include/qmath.h => brcmsmac/phy/wlc_phy_qmath.h} (100%)

diff --git a/[refs] b/[refs]
index 4ac89a25ab5a..7d5fe01f3e89 100644
--- 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
index 8dc234d0a23e..21797748100f 100644
--- 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
index 072209710e31..8fc1bef5c0a2 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
@@ -19,7 +19,6 @@
 #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>
@@ -27,10 +26,11 @@
 #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 b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c
similarity index 99%
rename from trunk/drivers/staging/brcm80211/util/qmath.c
rename to trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c
index 8b4a5b18d296..06172921a79b 100644
--- a/trunk/drivers/staging/brcm80211/util/qmath.c
+++ b/trunk/drivers/staging/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/trunk/drivers/staging/brcm80211/include/qmath.h b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.h
similarity index 100%
rename from trunk/drivers/staging/brcm80211/include/qmath.h
rename to trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.h