From 1201597dbb8e8ab83cab2c60c1e87dba0be8d410 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Tue, 3 May 2011 11:35:37 +0200 Subject: [PATCH] --- yaml --- r: 249320 b: refs/heads/master c: 36648b8bdaf75991ce1bea5bdf6699cd23c425fc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/Makefile | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c | 2 +- .../staging/brcm80211/{util/hndpmu.c => brcmsmac/wlc_pmu.c} | 2 +- .../staging/brcm80211/{include/hndpmu.h => brcmsmac/wlc_pmu.h} | 0 trunk/drivers/staging/brcm80211/util/siutils.c | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename trunk/drivers/staging/brcm80211/{util/hndpmu.c => brcmsmac/wlc_pmu.c} (99%) rename trunk/drivers/staging/brcm80211/{include/hndpmu.h => brcmsmac/wlc_pmu.h} (100%) diff --git a/[refs] b/[refs] index 9aeb04a6f61e..ac3ab7d197d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7754116bab5b69491dbb6eb320e59b244624df63 +refs/heads/master: 36648b8bdaf75991ce1bea5bdf6699cd23c425fc diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/Makefile b/trunk/drivers/staging/brcm80211/brcmsmac/Makefile index c4aafe5cf7f5..65a1a2508859 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/Makefile +++ b/trunk/drivers/staging/brcm80211/brcmsmac/Makefile @@ -38,6 +38,7 @@ BRCMSMAC_OFILES := \ wlc_channel.o \ wlc_main.o \ wlc_phy_shim.o \ + wlc_pmu.o \ wlc_rate.o \ wlc_stf.o \ phy/wlc_phy_cmn.o \ @@ -52,7 +53,6 @@ BRCMSMAC_OFILES := \ ../util/bcmotp.o \ ../util/bcmsrom.o \ ../util/hnddma.o \ - ../util/hndpmu.o \ ../util/nicpci.o \ ../util/qmath.o \ ../util/nvram/nvram_ro.o 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 4e7a20aaa761..d9f625496c9b 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c index 34a7b4e412b0..111b8e96b8db 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c index daeb36341a65..e9867ea0cc97 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c @@ -35,9 +35,9 @@ #include #include #include -#include #include "wlc_types.h" +#include "wlc_pmu.h" #include "d11.h" #include "wlc_cfg.h" #include "wlc_rate.h" diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c index b56d613f725b..ea12749555e2 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c @@ -29,8 +29,8 @@ #include #include #include -#include +#include "wlc_pmu.h" #include "d11.h" #include "wlc_types.h" #include "wlc_cfg.h" diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c index 0c4780d603cf..b00858271537 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include "wlc_types.h" #include "wl_dbg.h" diff --git a/trunk/drivers/staging/brcm80211/util/hndpmu.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pmu.c similarity index 99% rename from trunk/drivers/staging/brcm80211/util/hndpmu.c rename to trunk/drivers/staging/brcm80211/brcmsmac/wlc_pmu.c index 566e0304cb84..98ba8746b3a8 100644 --- a/trunk/drivers/staging/brcm80211/util/hndpmu.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pmu.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "siutils_priv.h" #define PMU_ERROR(args) diff --git a/trunk/drivers/staging/brcm80211/include/hndpmu.h b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_pmu.h similarity index 100% rename from trunk/drivers/staging/brcm80211/include/hndpmu.h rename to trunk/drivers/staging/brcm80211/brcmsmac/wlc_pmu.h diff --git a/trunk/drivers/staging/brcm80211/util/siutils.c b/trunk/drivers/staging/brcm80211/util/siutils.c index 202a8cff2c48..2097482785d1 100644 --- a/trunk/drivers/staging/brcm80211/util/siutils.c +++ b/trunk/drivers/staging/brcm80211/util/siutils.c @@ -40,7 +40,7 @@ #include #include #endif /* BCMSDIO */ -#include +#include /* this file now contains only definitions for sb functions, only necessary *for devices using Sonics backplanes (bcm4329)