From 04bcac9b2a6b6ddf5e9972b425fb8ce84d3224d3 Mon Sep 17 00:00:00 2001
From: Roland Vossen <rvossen@broadcom.com>
Date: Wed, 1 Jun 2011 13:45:45 +0200
Subject: [PATCH] --- yaml --- r: 259400 b: refs/heads/master c:
 5706e3de2773d267d3608ada1e4ea6cfdc2a38e4 h: refs/heads/master v: v3

---
 [refs]                                                        | 2 +-
 trunk/drivers/staging/brcm80211/brcmsmac/Makefile             | 4 ++--
 .../brcm80211/brcmsmac/{wl_mac80211.c => brcms_mac80211.c}    | 4 ++--
 .../brcm80211/brcmsmac/{wl_mac80211.h => brcms_mac80211.h}    | 0
 .../brcm80211/brcmsmac/{wl_ucode_loader.c => ucode_loader.c}  | 2 +-
 .../staging/brcm80211/brcmsmac/{wl_ucode.h => ucode_loader.h} | 0
 trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c           | 2 +-
 trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c           | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename trunk/drivers/staging/brcm80211/brcmsmac/{wl_mac80211.c => brcms_mac80211.c} (99%)
 rename trunk/drivers/staging/brcm80211/brcmsmac/{wl_mac80211.h => brcms_mac80211.h} (100%)
 rename trunk/drivers/staging/brcm80211/brcmsmac/{wl_ucode_loader.c => ucode_loader.c} (99%)
 rename trunk/drivers/staging/brcm80211/brcmsmac/{wl_ucode.h => ucode_loader.h} (100%)

diff --git a/[refs] b/[refs]
index 44dccf31a246..e767d47c0519 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8817f75429a18e8ceb4aa24bb7ae6c6019f36d70
+refs/heads/master: 5706e3de2773d267d3608ada1e4ea6cfdc2a38e4
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/Makefile b/trunk/drivers/staging/brcm80211/brcmsmac/Makefile
index 4356a29a3f1c..c6b5128250f7 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/Makefile
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/Makefile
@@ -28,8 +28,8 @@ ccflags-y :=				\
 	-Idrivers/staging/brcm80211/include
 
 BRCMSMAC_OFILES := \
-	wl_mac80211.o \
-	wl_ucode_loader.o \
+	brcms_mac80211.o \
+	ucode_loader.o \
 	wlc_alloc.o \
 	wlc_ampdu.o \
 	wlc_antsel.o \
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/trunk/drivers/staging/brcm80211/brcmsmac/brcms_mac80211.c
similarity index 99%
rename from trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
rename to trunk/drivers/staging/brcm80211/brcmsmac/brcms_mac80211.c
index cc2ed780f2ec..8eadb4365fa2 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/brcms_mac80211.c
@@ -42,8 +42,8 @@
 #include "wlc_pub.h"
 #include "wl_dbg.h"
 #include "wl_export.h"
-#include "wl_ucode.h"
-#include "wl_mac80211.h"
+#include "ucode_loader.h"
+#include "brcms_mac80211.h"
 
 #define N_TX_QUEUES	4 /* #tx queues on mac80211<->driver interface */
 
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h b/trunk/drivers/staging/brcm80211/brcmsmac/brcms_mac80211.h
similarity index 100%
rename from trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h
rename to trunk/drivers/staging/brcm80211/brcmsmac/brcms_mac80211.h
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c b/trunk/drivers/staging/brcm80211/brcmsmac/ucode_loader.c
similarity index 99%
rename from trunk/drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c
rename to trunk/drivers/staging/brcm80211/brcmsmac/ucode_loader.c
index cf0be6ba43f7..d38f1242bd92 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/ucode_loader.c
@@ -16,7 +16,7 @@
 
 #include <linux/types.h>
 #include <bcmdefs.h>
-#include <wl_ucode.h>
+#include <ucode_loader.h>
 
 enum {
 	D11UCODE_NAMETAG_START = 0,
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wl_ucode.h b/trunk/drivers/staging/brcm80211/brcmsmac/ucode_loader.h
similarity index 100%
rename from trunk/drivers/staging/brcm80211/brcmsmac/wl_ucode.h
rename to trunk/drivers/staging/brcm80211/brcmsmac/ucode_loader.h
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
index fe031f220fe4..57c6e8a03fcd 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
@@ -45,7 +45,7 @@
 #include "wlc_channel.h"
 #include "wlc_main.h"
 #include "wl_export.h"
-#include "wl_ucode.h"
+#include "ucode_loader.h"
 #include "wlc_antsel.h"
 #include "wlc_alloc.h"
 #include "wl_dbg.h"
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c
index 1a2108cc1419..d5ba632c6767 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c
@@ -49,7 +49,7 @@
 #include "wl_export.h"
 #include "wlc_alloc.h"
 #include "wl_dbg.h"
-#include "wl_mac80211.h"
+#include "brcms_mac80211.h"
 
 /*
  * WPA(2) definitions