From a250a985c9546b86a73e70f661ae5e2ac15d6566 Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Fri, 4 Jan 2013 23:35:08 -0500
Subject: [PATCH] --- yaml --- r: 353835 b: refs/heads/master c:
 4b388a9e1da7156dbf924e38741beaac1b4e29d1 h: refs/heads/master i:   353833:
 38f2a9a44fd5be9a62cf3e3229e0863eda9f82ac   353831:
 5400aafc4b53baea77f6533615efcc8ca1ae21a6 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/staging/bcm/Adapter.h | 2 +-
 trunk/drivers/staging/bcm/Debug.h   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 12ebffecf96f..addb870b4cdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2a089b7732df4750617c82d390ace61a60ddb0d
+refs/heads/master: 4b388a9e1da7156dbf924e38741beaac1b4e29d1
diff --git a/trunk/drivers/staging/bcm/Adapter.h b/trunk/drivers/staging/bcm/Adapter.h
index ade7bfd9cde3..1d8bf08b5bfd 100644
--- a/trunk/drivers/staging/bcm/Adapter.h
+++ b/trunk/drivers/staging/bcm/Adapter.h
@@ -392,7 +392,7 @@ struct bcm_mini_adapter {
 	struct semaphore	LowPowerModeSync;
 	ULONG			liDrainCalculated;
 	UINT			gpioBitMap;
-	S_BCM_DEBUG_STATE	stDebugState;
+	struct bcm_debug_state	stDebugState;
 };
 
 #define GET_BCM_ADAPTER(net_dev) netdev_priv(net_dev)
diff --git a/trunk/drivers/staging/bcm/Debug.h b/trunk/drivers/staging/bcm/Debug.h
index 663325bc5ad7..e81db0d0f7a3 100644
--- a/trunk/drivers/staging/bcm/Debug.h
+++ b/trunk/drivers/staging/bcm/Debug.h
@@ -178,7 +178,7 @@ typedef struct {
 } __packed USER_BCM_DBG_STATE;
 
 /* ---Kernel-space mapping of Debug State */
-typedef struct _S_BCM_DEBUG_STATE {
+struct bcm_debug_state {
 	unsigned int type;
 	/* A bitmap of 32 bits for Subtype per Type.
 	 * Valid indexes in 'subtype' array are *only* 1,2,4 and 8,
@@ -187,7 +187,7 @@ typedef struct _S_BCM_DEBUG_STATE {
 	 */
 	unsigned int subtype[(NUMTYPES*2)+1];
 	unsigned int debug_level;
-} S_BCM_DEBUG_STATE;
+};
 /* Instantiated in the Adapter structure
  * We'll reuse the debug level parameter to include a bit (the MSB) to indicate whether or not
  * we want the function's name printed.