From: "Arend van Spriel" <arend@broadcom.com>
To: gregkh@suse.de
Cc: "Henry Ptasinski" <henryp@broadcom.com>,
devel@linuxdriverproject.org, linux-wireless@vger.kernel.org,
"Arend van Spriel" <arend@broadcom.com>
Subject: [PATCH 2/9] staging: brcm80211: move files only used by brcmsmac into appropriate dir
Date: Mon, 9 May 2011 16:33:03 +0200 [thread overview]
Message-ID: <1304951590-2411-3-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1304951590-2411-1-git-send-email-arend@broadcom.com>
From: Henry Ptasinski <henryp@broadcom.com>
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@linuxdriverproject.org
Cc: linux-wireless@vger.kernel.org
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
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
next prev parent reply other threads:[~2011-05-09 14:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1304951590-2411-1-git-send-email-arend@broadcom.com>
2011-05-09 14:33 ` [PATCH 1/9] staging: brcm80211: move header file Arend van Spriel
2011-05-09 14:33 ` Arend van Spriel [this message]
2011-05-09 14:33 ` [PATCH 3/9] staging: brcm80211: delete unneeded files Arend van Spriel
2011-05-09 14:33 ` [PATCH 4/9] staging: brcm80211: remove unnecessary header file Arend van Spriel
2011-05-09 14:33 ` [PATCH 5/9] staging: brcm80211: remove unneeded include path Arend van Spriel
2011-05-09 14:33 ` [PATCH 6/9] staging: brcm80211: remove unused function Arend van Spriel
2011-05-09 14:33 ` [PATCH 7/9] staging: brcm80211: move another file only used by brcmsmac into appropriate dir Arend van Spriel
2011-05-09 14:33 ` [PATCH 8/9] staging: brcm80211: move functions only used by brcmsmac out of utils Arend van Spriel
2011-05-09 14:33 ` [PATCH 9/9] staging: brcm80211: move utility functions into new module Arend van Spriel
2011-05-10 4:18 ` Julian Calaby
2011-05-10 4:20 ` Julian Calaby
2011-05-10 10:58 ` Arend van Spriel
2011-05-10 18:04 ` Greg KH
2011-05-10 19:04 ` Arend van Spriel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1304951590-2411-3-git-send-email-arend@broadcom.com \
--to=arend@broadcom.com \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@suse.de \
--cc=henryp@broadcom.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).