diff options
| author | Arend van Spriel <arend@broadcom.com> | 2011-05-03 11:35:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-03 12:42:46 -0700 |
| commit | 652dfad2dc8ff6daa976585d91de4f26ea3a3a2c (patch) | |
| tree | dde4bf0b3310a5f1b4d659ffe81a3da4c01f2bb0 | |
| parent | 085a5cf16299e139672e51f9cf9e605b5b294af2 (diff) | |
| download | kernel_samsung_smdk4412-652dfad2dc8ff6daa976585d91de4f26ea3a3a2c.zip kernel_samsung_smdk4412-652dfad2dc8ff6daa976585d91de4f26ea3a3a2c.tar.gz kernel_samsung_smdk4412-652dfad2dc8ff6daa976585d91de4f26ea3a3a2c.tar.bz2 | |
staging: brcm80211: move qmath sources to phy directory
The functions provided by qmath sources are only used by the
phy source code so qmath sources have been moved there.
Cc: devel@linuxdriverproject.org
Cc: linux-wireless@vger.kernel.org
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c | 10 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c (renamed from drivers/staging/brcm80211/util/qmath.c) | 3 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.h (renamed from drivers/staging/brcm80211/include/qmath.h) | 0 |
4 files changed, 8 insertions, 7 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile index 8dc234d..2179774 100644 --- a/drivers/staging/brcm80211/brcmsmac/Makefile +++ b/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/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c index 0722097..8fc1bef 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c +++ b/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/drivers/staging/brcm80211/util/qmath.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c index 8b4a5b1..0617292 100644 --- a/drivers/staging/brcm80211/util/qmath.c +++ b/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/drivers/staging/brcm80211/include/qmath.h b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.h index 5f525db..5f525db 100644 --- a/drivers/staging/brcm80211/include/qmath.h +++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.h |