summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenry Ptasinski <henryp@broadcom.com>2011-05-09 16:33:08 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-10 11:07:17 -0700
commit192f25a24f433886a97fc164182cd35963f0bf57 (patch)
tree6ae98b1c34d7eba63c2b98cf3eb62f4c6c80b7e4
parentf835f455169913e89fe0c876cf10dfad15fb3a20 (diff)
downloadop-kernel-dev-192f25a24f433886a97fc164182cd35963f0bf57.zip
op-kernel-dev-192f25a24f433886a97fc164182cd35963f0bf57.tar.gz
staging: brcm80211: move another file only used by brcmsmac into appropriate dir
nvram functions are only needed by brcmsmac. 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>
-rw-r--r--drivers/staging/brcm80211/brcmsmac/Makefile2
-rw-r--r--drivers/staging/brcm80211/brcmsmac/nvram.c (renamed from drivers/staging/brcm80211/util/nvram/nvram_ro.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile
index 1cd3a1e..ccf1ced 100644
--- a/drivers/staging/brcm80211/brcmsmac/Makefile
+++ b/drivers/staging/brcm80211/brcmsmac/Makefile
@@ -53,7 +53,7 @@ BRCMSMAC_OFILES := \
nicpci.o \
../util/bcmutils.o \
../util/bcmwifi.o \
- ../util/nvram/nvram_ro.o
+ nvram.o
MODULEPFX := brcmsmac
diff --git a/drivers/staging/brcm80211/util/nvram/nvram_ro.c b/drivers/staging/brcm80211/brcmsmac/nvram.c
index 0e93a55..0e93a55 100644
--- a/drivers/staging/brcm80211/util/nvram/nvram_ro.c
+++ b/drivers/staging/brcm80211/brcmsmac/nvram.c
OpenPOWER on IntegriCloud