[PATCH2 07/12] staging: brcm80211: move hndpmu sources to brcmfmac folder

[Arend van Spriel]

hndpmu is only used by the brcmfmac driver and therefor moved to the
driver specific folder.

Reviewed-by: Roland Vossen <rvossen at broadcom.com>
Reviewed-by: Henry Ptasinski <henryp at broadcom.com>
Signed-off-by: Arend van Spriel <arend at broadcom.com>
---
 drivers/staging/brcm80211/brcmfmac/Makefile        |    4 ++--
 .../{util/hndpmu.c => brcmfmac/dhd_pmu.c}          |    3 ++-
 .../{include/hndpmu.h => brcmfmac/dhd_pmu.h}       |    0
 drivers/staging/brcm80211/brcmfmac/dhd_sdio.c      |    2 +-
 drivers/staging/brcm80211/brcmfmac/hndpmu.c        |    1 -
 drivers/staging/brcm80211/util/siutils.c           |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename drivers/staging/brcm80211/{util/hndpmu.c => brcmfmac/dhd_pmu.c} (99%)
 rename drivers/staging/brcm80211/{include/hndpmu.h => brcmfmac/dhd_pmu.h} (100%)
 delete mode 100644 drivers/staging/brcm80211/brcmfmac/hndpmu.c

diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile
index f8c0bdd..c3a4d91 100644
--- a/drivers/staging/brcm80211/brcmfmac/Makefile
+++ b/drivers/staging/brcm80211/brcmfmac/Makefile
@@ -48,6 +48,7 @@ DHDOFILES = \
 	dhd_sdio.o	\
 	dhd_linux.o \
 	dhd_linux_sched.o \
+	dhd_pmu.o \
 	bcmsdh.o \
 	bcmsdh_linux.o	\
 	bcmsdh_sdmmc.o \
@@ -55,8 +56,7 @@ DHDOFILES = \
 	siutils.o \
 	sbutils.o \
 	bcmutils.o \
-	bcmwifi.o \
-	hndpmu.o
+	bcmwifi.o
 
 obj-m += brcmfmac.o
 brcmfmac-objs += $(DHDOFILES)
diff --git a/drivers/staging/brcm80211/util/hndpmu.c b/drivers/staging/brcm80211/brcmfmac/dhd_pmu.c
similarity index 99%
rename from drivers/staging/brcm80211/util/hndpmu.c
rename to drivers/staging/brcm80211/brcmfmac/dhd_pmu.c
index 60afcde..5e46d7b 100644
--- a/drivers/staging/brcm80211/util/hndpmu.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_pmu.c
@@ -24,7 +24,8 @@
 #include <bcmdevs.h>
 #include <hndsoc.h>
 #include <sbchipc.h>
-#include <hndpmu.h>
+
+#include "dhd_pmu.h"
 #include "siutils_priv.h"
 
 #define	PMU_ERROR(args)
diff --git a/drivers/staging/brcm80211/include/hndpmu.h b/drivers/staging/brcm80211/brcmfmac/dhd_pmu.h
similarity index 100%
rename from drivers/staging/brcm80211/include/hndpmu.h
rename to drivers/staging/brcm80211/brcmfmac/dhd_pmu.h
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index e6f22fe..048c629 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -29,7 +29,7 @@
 #include <bcmdevs.h>
 
 #include <siutils.h>
-#include <hndpmu.h>
+#include <dhd_pmu.h>
 #include <hndsoc.h>
 #ifdef DHD_DEBUG
 #include <hndrte_armtrap.h>
diff --git a/drivers/staging/brcm80211/brcmfmac/hndpmu.c b/drivers/staging/brcm80211/brcmfmac/hndpmu.c
deleted file mode 100644
index e841da6..0000000
--- a/drivers/staging/brcm80211/brcmfmac/hndpmu.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../util/hndpmu.c"
diff --git a/drivers/staging/brcm80211/util/siutils.c b/drivers/staging/brcm80211/util/siutils.c
index 8ff0722..5319057 100644
--- a/drivers/staging/brcm80211/util/siutils.c
+++ b/drivers/staging/brcm80211/util/siutils.c
@@ -38,7 +38,7 @@
 #include <sbhnddma.h>
 #include <sbsdpcmdev.h>
 #include <bcmsdpcm.h>
-#include <hndpmu.h>
+#include <dhd_pmu.h>
 
 /* this file now contains only definitions for sb functions, only necessary
 *for devices using Sonics backplanes (bcm4329)
-- 
1.7.1