[PATCH] staging:brcm80211:brcmfmac:change firmware/config file name

[nohee ko]

Change firmware/config file names to follow firmware
file guidelines for 802.11. Use -4- as API number.


Signed-off-by: Nohee Ko <noheek at broadcom.com>
---
 drivers/staging/brcm80211/brcmfmac/README        |    7 ++++++-
 drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c |    4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/brcm80211/brcmfmac/README b/drivers/staging/brcm80211/brcmfmac/README
index 43601fa..215cdea 100644
--- a/drivers/staging/brcm80211/brcmfmac/README
+++ b/drivers/staging/brcm80211/brcmfmac/README
@@ -26,7 +26,12 @@ Firmware is available from the Linux firmware repository at:
 	https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git
 
 For 4329 chip, copy brcm/bcm4329-fullmac-4-218-248-5.bin and
-bcm4329-fullmac-4-218-248-5.txt to /lib/firmware/brcm
+brcm/bcm4329-fullmac-4-218-248-5.txt to /lib/firmware/brcm
+(or wherever firmware is normally installed on the system).
+In the /lib/firmware/brcm directory, then create the following symlinks:
+
+	ln -s bcm4329-fullmac-4-218-248-5.bin bcm4329-fullmac-4.bin
+	ln -s bcm4329-fullmac-4-218-248-5.txt bcm4329-fullmac-4.txt
 
 Contact Info:
 =============
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 621521b..7f00bc4 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -54,8 +54,8 @@ static struct wl_dev *wl_cfg80211_dev;
 
 u32 wl_dbg_level = WL_DBG_ERR | WL_DBG_INFO;
 
-#define WL_4329_FW_FILE "brcm/bcm4329-fullmac-4-218-248-5.bin"
-#define WL_4329_NVRAM_FILE "brcm/bcm4329-fullmac-4-218-248-5.txt"
+#define WL_4329_FW_FILE "brcm/bcm4329-fullmac-4.bin"
+#define WL_4329_NVRAM_FILE "brcm/bcm4329-fullmac-4.txt"
 
 /*
 ** cfg80211_ops api/callback list
-- 
1.7.0.4