From 082ec3577524db1e244d66eaefd14889c14c21fe Mon Sep 17 00:00:00 2001
From: Adam Latham <adam.latham@unisontorbay.org.uk>
Date: Wed, 19 May 2010 06:55:26 +0100
Subject: [PATCH] --- yaml --- r: 205571 b: refs/heads/master c:
 cb016cc48a011cbe23c4c742a577108853b66e3f h: refs/heads/master i:   205569:
 e69725c1179664efd33cc0e58d7a935b5d5dddd6   205567:
 032564fac70fef24449a248d6d831043d44db3b5 v: v3

---
 [refs]                                        |  2 +-
 .../drivers/staging/winbond/mac_structures.h  | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 33576cebe6e6..1aadc00d81aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15f0beb16937acef2bbfd1d7541612c2e7b0d37c
+refs/heads/master: cb016cc48a011cbe23c4c742a577108853b66e3f
diff --git a/trunk/drivers/staging/winbond/mac_structures.h b/trunk/drivers/staging/winbond/mac_structures.h
index 7441015cb187..a390adff247b 100644
--- a/trunk/drivers/staging/winbond/mac_structures.h
+++ b/trunk/drivers/staging/winbond/mac_structures.h
@@ -98,28 +98,28 @@
 #define ELEMENT_ID_CF_PARAMETER_SET         4
 #define ELEMENT_ID_TIM                      5
 #define ELEMENT_ID_IBSS_PARAMETER_SET       6
-// 7~15 reserverd
+/* 7~15 reserverd */
 #define ELEMENT_ID_CHALLENGE_TEXT           16
-// 17~31 reserved for challenge text extension
-// 32~255 reserved
-//--  11G  --
+/* 17~31 reserved for challenge text extension */
+/* 32~255 reserved */
+/*--  11G  -- */
 #define ELEMENT_ID_ERP_INFORMATION			42
 #define ELEMENT_ID_EXTENDED_SUPPORTED_RATES 50
 
-//--  WPA  --
+/* --  WPA  -- */
 
 #define ELEMENT_ID_RSN_WPA					221
 #ifdef _WPA2_
 #define ELEMENT_ID_RSN_WPA2				    48
-#endif //endif WPA2
+#endif /* endif WPA2 */
 
 #define WLAN_MAX_PAIRWISE_CIPHER_SUITE_COUNT    ((u16) 6)
 #define WLAN_MAX_AUTH_KEY_MGT_SUITE_LIST_COUNT  ((u16) 2)
 
-//===================================================================
-//  Reason Code (Table 18): indicate the reason of DisAssoc, DeAuthen
-//  length of ReasonCode is 2 Octs.
-//===================================================================
+/* ===================================================================
+*  Reason Code (Table 18): indicate the reason of DisAssoc, DeAuthen
+*  length of ReasonCode is 2 Octs.
+* =================================================================== */
 #define REASON_REASERED             0
 #define REASON_UNSPECIDIED          1
 #define REASON_PREAUTH_INVALID      2
@@ -433,7 +433,7 @@ struct suite_selector
 	};
 };
 
-//--  WPA  --
+/* --  WPA  -- */
 struct	RSN_Information_Element
 {
 	u8					Element_ID;