From f3e5656d66df049a71033a9b247645b653a8da89 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Mon, 18 Jul 2011 21:16:51 -0500
Subject: [PATCH] --- yaml --- r: 267736 b: refs/heads/master c:
 9bf6e4c146a9da9d44f7bdb259c233db28b64003 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/rtl8192e/r8190P_def.h     | 4 ++--
 trunk/drivers/staging/rtl8192e/r8190P_rtl8256.c | 2 +-
 trunk/drivers/staging/rtl8192e/r8192E_phy.c     | 4 ++--
 trunk/drivers/staging/rtl8192e/rtl_core.h       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 31837bb70ed7..a827cba5ae9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38b1f67d9dffd8adebf5558d790c7fc5a5b5dc80
+refs/heads/master: 9bf6e4c146a9da9d44f7bdb259c233db28b64003
diff --git a/trunk/drivers/staging/rtl8192e/r8190P_def.h b/trunk/drivers/staging/rtl8192e/r8190P_def.h
index 52c00a1c14bc..f2ad86218d78 100644
--- a/trunk/drivers/staging/rtl8192e/r8190P_def.h
+++ b/trunk/drivers/staging/rtl8192e/r8190P_def.h
@@ -159,7 +159,7 @@ typedef	enum _INTERFACE_SELECT_8190PCI{
 	INTF_SEL3_RSV			= 3,
 } INTERFACE_SELECT_8190PCI, *PINTERFACE_SELECT_8190PCI;
 
-typedef struct _BB_REGISTER_DEFINITION{
+struct bb_reg_definition {
 	u32 rfintfs;
 	u32 rfintfi;
 	u32 rfintfo;
@@ -178,7 +178,7 @@ typedef struct _BB_REGISTER_DEFINITION{
 	u32 rfTxAFE;
 	u32 rfLSSIReadBack;
 	u32 rfLSSIReadBackPi;
-}BB_REGISTER_DEFINITION_T, *PBB_REGISTER_DEFINITION_T;
+};//, *struct bb_reg_definition *;
 
 typedef struct _TX_FWINFO_STRUCUTRE{
 	u8			TxRate:7;
diff --git a/trunk/drivers/staging/rtl8192e/r8190P_rtl8256.c b/trunk/drivers/staging/rtl8192e/r8190P_rtl8256.c
index b6587000f93b..da1cdb5da1cc 100644
--- a/trunk/drivers/staging/rtl8192e/r8190P_rtl8256.c
+++ b/trunk/drivers/staging/rtl8192e/r8190P_rtl8256.c
@@ -79,7 +79,7 @@ bool phy_RF8256_Config_ParaFile(struct net_device* dev)
 	u32	u4RegValue = 0;
 	u8	eRFPath;
 	bool rtStatus = true;
-	BB_REGISTER_DEFINITION_T	*pPhyReg;
+	struct bb_reg_definition *pPhyReg;
 	struct r8192_priv *priv = rtllib_priv(dev);
 	u32	RegOffSetToBeCheck = 0x3;
 	u32	RegValueToBeCheck = 0x7f1;
diff --git a/trunk/drivers/staging/rtl8192e/r8192E_phy.c b/trunk/drivers/staging/rtl8192e/r8192E_phy.c
index c462d74c4de2..566eea1337a9 100644
--- a/trunk/drivers/staging/rtl8192e/r8192E_phy.c
+++ b/trunk/drivers/staging/rtl8192e/r8192E_phy.c
@@ -104,7 +104,7 @@ u32 rtl8192_phy_RFSerialRead(struct net_device* dev, RF90_RADIO_PATH_E eRFPath,
 	struct r8192_priv *priv = rtllib_priv(dev);
 	u32 ret = 0;
 	u32 NewOffset = 0;
-	BB_REGISTER_DEFINITION_T* pPhyReg = &priv->PHYRegDef[eRFPath];
+	struct bb_reg_definition* pPhyReg = &priv->PHYRegDef[eRFPath];
 	Offset &= 0x3f;
 
 	if (priv->rf_chip == RF_8256)
@@ -164,7 +164,7 @@ void rtl8192_phy_RFSerialWrite(struct net_device* dev, RF90_RADIO_PATH_E eRFPath
 {
 	struct r8192_priv *priv = rtllib_priv(dev);
 	u32 DataAndAddr = 0, NewOffset = 0;
-	BB_REGISTER_DEFINITION_T	*pPhyReg = &priv->PHYRegDef[eRFPath];
+	struct bb_reg_definition *pPhyReg = &priv->PHYRegDef[eRFPath];
 
 	Offset &= 0x3f;
 	if (priv->rf_chip == RF_8256)
diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.h b/trunk/drivers/staging/rtl8192e/rtl_core.h
index a199cfdc30e7..4fc78aa2368b 100644
--- a/trunk/drivers/staging/rtl8192e/rtl_core.h
+++ b/trunk/drivers/staging/rtl8192e/rtl_core.h
@@ -596,7 +596,7 @@ typedef struct r8192_priv
 	RT_RF_TYPE_819xU		rf_chip;
 	IC_INFERIORITY_8192S		IC_Class;
 	HT_CHANNEL_WIDTH		CurrentChannelBW;
-	BB_REGISTER_DEFINITION_T	PHYRegDef[4];
+	struct bb_reg_definition PHYRegDef[4];
 	rate_adaptive				rate_adaptive;
 
 	ccktxbbgain_struct			cck_txbbgain_table[CCKTxBBGainTableLength];