From dca6f00083cb0ae12fe07e0976a0b676605bb3af Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Tue, 19 Jul 2011 19:30:04 -0500
Subject: [PATCH] --- yaml --- r: 267837 b: refs/heads/master c:
 379a20fb29f9328d132cc1839192153149858940 h: refs/heads/master i:   267835:
 bde51752b94660e419dd5e9aafa3c21fbec8ff45 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/rtl8192e/rtl819x_Qos.h | 6 +++---
 trunk/drivers/staging/rtl8192e/rtl_core.h    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2a11af2d05e4..ae264365af56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f12dfcb016044ec1c08bb8186255bfb58bbd84f4
+refs/heads/master: 379a20fb29f9328d132cc1839192153149858940
diff --git a/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h b/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h
index 19f10e8cdaef..59ab0b87227f 100644
--- a/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h
+++ b/trunk/drivers/staging/rtl8192e/rtl819x_Qos.h
@@ -222,11 +222,11 @@ enum direction_value {
 	DIR_BI_DIR		= 3,
 };
 
-typedef	enum _ACM_METHOD{
+enum acm_method {
 	eAcmWay0_SwAndHw		= 0,
 	eAcmWay1_HW			= 1,
 	eAcmWay2_SW			= 2,
-} ACM_METHOD,*PACM_METHOD;
+};
 
 
 struct acm {
@@ -331,7 +331,7 @@ struct sta_qos {
 	u8				WMMParamEle[WMM_PARAM_ELEMENT_SIZE];
 
 	struct acm acm[4];
-	ACM_METHOD		AcmMethod;
+	enum acm_method AcmMethod;
 
 	struct qos_tstream StaTsArray[MAX_STA_TS_COUNT];
 	u8				DialogToken;
diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.h b/trunk/drivers/staging/rtl8192e/rtl_core.h
index 46d8fb99e701..3e046aa799d9 100644
--- a/trunk/drivers/staging/rtl8192e/rtl_core.h
+++ b/trunk/drivers/staging/rtl8192e/rtl_core.h
@@ -598,7 +598,7 @@ struct r8192_priv {
 
 	struct txbbgain_struct txbbgain_table[TxBBGainTableLength];
 
-	ACM_METHOD				AcmMethod;
+	enum acm_method AcmMethod;
 
 	struct rt_firmware			*pFirmware;
 	enum rtl819x_loopback LoopbackMode;