From 4374de88e8e9ed0c0a788299710a2b6214caebad Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Sat, 26 May 2012 12:05:09 -0400
Subject: [PATCH] --- yaml --- r: 317183 b: refs/heads/master c:
 c1975eda98d12c7b34cdc94c53cda32de263e4af h: refs/heads/master i:   317181:
 07f02e18bd2369019a9c049cf6965967a330e34b   317179:
 69b7fb65d4f9cb94a8a87f945d4e89f9bfd18800   317175:
 4ba112ffc78acbeb9b035e0029538e7280a10e1b   317167:
 cec1f75433679b4f90c45aa38d426eefd639c0c5   317151:
 a2b0dd331121ffc78d49b9d9edfd17036faa6771   317119:
 cea8c0563bbbd68c1966429ea1e576252d340bcd   317055:
 c31ed1a30add53d3b7ad0a2a4474bbff2f75627c   316927:
 a11a0a8db6921df230f8fdc29b2e9a52c070d289 v: v3

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

diff --git a/[refs] b/[refs]
index e81f045468fc..20e1b746f7d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2610c7a889103587ce9a5714291a53dbf5490c3c
+refs/heads/master: c1975eda98d12c7b34cdc94c53cda32de263e4af
diff --git a/trunk/drivers/staging/bcm/Adapter.h b/trunk/drivers/staging/bcm/Adapter.h
index a36767d9c551..ea83bc03b696 100644
--- a/trunk/drivers/staging/bcm/Adapter.h
+++ b/trunk/drivers/staging/bcm/Adapter.h
@@ -21,12 +21,11 @@ struct _PACKETTOSEND {
 } __packed;
 typedef struct _PACKETTOSEND PACKETTOSEND, *PPACKETTOSEND;
 
-struct _CONTROL_PACKET {
+struct bcm_control_packet {
 	PVOID	ControlBuff;
 	UINT	ControlBuffLen;
-	struct _CONTROL_PACKET *next;
+	struct bcm_control_packet *next;
 } __packed;
-typedef struct _CONTROL_PACKET CONTROL_PACKET, *PCONTROL_PACKET;
 
 struct bcm_link_request {
 	LEADER	Leader;