From 95de890af233983747004e6e1f24492b82cb85f0 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Fri, 18 Dec 2009 23:08:15 +0200
Subject: [PATCH] --- yaml --- r: 186550 b: refs/heads/master c:
 1bc5e651295ab35fc7d396d940cf9a1e530c0a7e h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/winbond/core.h      | 2 +-
 trunk/drivers/staging/winbond/localpara.h | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6de2669f69d9..4744f3e91258 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fc0d278e3198c8aa9baa71c49a8364d31686ba9
+refs/heads/master: 1bc5e651295ab35fc7d396d940cf9a1e530c0a7e
diff --git a/trunk/drivers/staging/winbond/core.h b/trunk/drivers/staging/winbond/core.h
index 7d4bd5e8f69b..0a2060bf4f94 100644
--- a/trunk/drivers/staging/winbond/core.h
+++ b/trunk/drivers/staging/winbond/core.h
@@ -14,7 +14,7 @@
 struct wbsoft_priv {
 	u32 adapterIndex;	// 20060703.4 Add for using padapterContext global adapter point
 
-	WB_LOCALDESCRIPT sLocalPara;	// Myself connected parameters
+	struct wb_local_para sLocalPara;	// Myself connected parameters
 
 	MLME_FRAME sMlmeFrame;	// connect to peerSTA parameters
 
diff --git a/trunk/drivers/staging/winbond/localpara.h b/trunk/drivers/staging/winbond/localpara.h
index 5626a76d69a4..b731875f80f5 100644
--- a/trunk/drivers/staging/winbond/localpara.h
+++ b/trunk/drivers/staging/winbond/localpara.h
@@ -136,7 +136,7 @@ typedef struct _RadioOff
 } RadioOff, *psRadioOff;
 
 //===========================================================================
-typedef struct LOCAL_PARA
+struct wb_local_para
 {
 	u8			PermanentAddress[ MAC_ADDR_LENGTH + 2 ]; 	// read from EPROM, manufacture set for each NetCard
     u8    		ThisMacAddress[ MAC_ADDR_LENGTH + 2 ];			// the driver will use actually.
@@ -274,6 +274,6 @@ typedef struct LOCAL_PARA
 	u16		IE_Append_size;
 	u16		reserved_7;
 
-} WB_LOCALDESCRIPT, *PWB_LOCALDESCRIPT;
+};
 
 #endif