From: Henry Ptasinski <henryp@xxxxxxxxxxxx>
A number of files in the util subdir are only used by the brcmsmac driver.
Move those files into the brcmsmac subdir instead, and do the necessary
Makefile updates to get the files from the new location.
Cc: devel@xxxxxxxxxxxxxxxxxxxxxx
Cc: linux-wireless@xxxxxxxxxxxxxxx
Reviewed-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
---
drivers/staging/brcm80211/brcmsmac/Makefile | 9 ++++-----
.../staging/brcm80211/{util => brcmsmac}/bcmotp.c | 0
.../staging/brcm80211/{util => brcmsmac}/bcmsrom.c | 0
.../brcm80211/{util => brcmsmac}/bcmsrom_tbl.h | 0
.../staging/brcm80211/{util => brcmsmac}/hnddma.c | 0
.../staging/brcm80211/{util => brcmsmac}/nicpci.c | 0
6 files changed, 4 insertions(+), 5 deletions(-)
rename drivers/staging/brcm80211/{util => brcmsmac}/bcmotp.c (100%)
rename drivers/staging/brcm80211/{util => brcmsmac}/bcmsrom.c (100%)
rename drivers/staging/brcm80211/{util => brcmsmac}/bcmsrom_tbl.h (100%)
rename drivers/staging/brcm80211/{util => brcmsmac}/hnddma.c (100%)
rename drivers/staging/brcm80211/{util => brcmsmac}/nicpci.c (100%)
diff --git a/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile
index 2179774..1cd3a1e 100644
--- a/drivers/staging/brcm80211/brcmsmac/Makefile
+++ b/drivers/staging/brcm80211/brcmsmac/Makefile
@@ -25,7 +25,6 @@ ccflags-y := \
-DBCMNVRAMR \
-Idrivers/staging/brcm80211/brcmsmac \
-Idrivers/staging/brcm80211/brcmsmac/phy \
- -Idrivers/staging/brcm80211/util \
-Idrivers/staging/brcm80211/include
BRCMSMAC_OFILES := \
@@ -48,12 +47,12 @@ BRCMSMAC_OFILES := \
phy/wlc_phytbl_lcn.o \
phy/wlc_phytbl_n.o \
phy/wlc_phy_qmath.o \
+ bcmotp.o \
+ bcmsrom.o \
+ hnddma.o \
+ nicpci.o \
../util/bcmutils.o \
../util/bcmwifi.o \
- ../util/bcmotp.o \
- ../util/bcmsrom.o \
- ../util/hnddma.o \
- ../util/nicpci.o \
../util/nvram/nvram_ro.o
MODULEPFX := brcmsmac
diff --git a/drivers/staging/brcm80211/util/bcmotp.c b/drivers/staging/brcm80211/brcmsmac/bcmotp.c
similarity index 100%
rename from drivers/staging/brcm80211/util/bcmotp.c
rename to drivers/staging/brcm80211/brcmsmac/bcmotp.c
diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/brcmsmac/bcmsrom.c
similarity index 100%
rename from drivers/staging/brcm80211/util/bcmsrom.c
rename to drivers/staging/brcm80211/brcmsmac/bcmsrom.c
diff --git a/drivers/staging/brcm80211/util/bcmsrom_tbl.h b/drivers/staging/brcm80211/brcmsmac/bcmsrom_tbl.h
similarity index 100%
rename from drivers/staging/brcm80211/util/bcmsrom_tbl.h
rename to drivers/staging/brcm80211/brcmsmac/bcmsrom_tbl.h
diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/brcmsmac/hnddma.c
similarity index 100%
rename from drivers/staging/brcm80211/util/hnddma.c
rename to drivers/staging/brcm80211/brcmsmac/hnddma.c
diff --git a/drivers/staging/brcm80211/util/nicpci.c b/drivers/staging/brcm80211/brcmsmac/nicpci.c
similarity index 100%
rename from drivers/staging/brcm80211/util/nicpci.c
rename to drivers/staging/brcm80211/brcmsmac/nicpci.c
--
1.7.4.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
