diff options
| author |   Henry Ptasinski <henryp@broadcom.com> | 2011-05-09 16:33:03 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-10 11:07:13 -0700 |
| commit | 47d30257706a90926de396bc3055684d9215abd9 (patch) | |
| tree | 343c5c5ecc6e9574be4b4e3c8a4c5774f6e99d2c /drivers | |
| parent | staging: brcm80211: move header file (diff) | |
| download | linux-dev-47d30257706a90926de396bc3055684d9215abd9.tar.xz linux-dev-47d30257706a90926de396bc3055684d9215abd9.zip | |
staging: brcm80211: move files only used by brcmsmac into appropriate dir
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/Makefile | 9 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/bcmotp.c (renamed from drivers/staging/brcm80211/util/bcmotp.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/bcmsrom.c (renamed from drivers/staging/brcm80211/util/bcmsrom.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/bcmsrom_tbl.h (renamed from drivers/staging/brcm80211/util/bcmsrom_tbl.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/hnddma.c (renamed from drivers/staging/brcm80211/util/hnddma.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/nicpci.c (renamed from drivers/staging/brcm80211/util/nicpci.c) | 0 |
6 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile index 21797748100f..1cd3a1eada96 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 index d09628b5a88e..d09628b5a88e 100644 --- a/drivers/staging/brcm80211/util/bcmotp.c +++ b/drivers/staging/brcm80211/brcmsmac/bcmotp.c diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/brcmsmac/bcmsrom.c index 8df44555f878..8df44555f878 100644 --- a/drivers/staging/brcm80211/util/bcmsrom.c +++ b/drivers/staging/brcm80211/brcmsmac/bcmsrom.c diff --git a/drivers/staging/brcm80211/util/bcmsrom_tbl.h b/drivers/staging/brcm80211/brcmsmac/bcmsrom_tbl.h index f4b3e61dc37d..f4b3e61dc37d 100644 --- a/drivers/staging/brcm80211/util/bcmsrom_tbl.h +++ b/drivers/staging/brcm80211/brcmsmac/bcmsrom_tbl.h diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/brcmsmac/hnddma.c index 0737fb2dabbe..0737fb2dabbe 100644 --- a/drivers/staging/brcm80211/util/hnddma.c +++ b/drivers/staging/brcm80211/brcmsmac/hnddma.c diff --git a/drivers/staging/brcm80211/util/nicpci.c b/drivers/staging/brcm80211/brcmsmac/nicpci.c index 5a127d253d02..5a127d253d02 100644 --- a/drivers/staging/brcm80211/util/nicpci.c +++ b/drivers/staging/brcm80211/brcmsmac/nicpci.c |