Merge git://git.infradead.org/battery-2.6

[mv-sheeva.git] / drivers / staging / rtl8187se / r8180.h

diff --git a/drivers/staging/rtl8187se/r8180.h b/drivers/staging/rtl8187se/r8180.h
index 8216d7e96d604b876e60ddc15b877cc1511334b3..ce828885b64f755f7d69914b2710a886a1dfe1f3 100644 (file)
--- a/drivers/staging/rtl8187se/r8180.h
+++ b/drivers/staging/rtl8187se/r8180.h
@@ -77,21 +77,6 @@ typedef enum _WIRELESS_MODE {
        WIRELESS_MODE_AUTO = 0x08,
 } WIRELESS_MODE;
 
-typedef enum _VERSION_8185{
-       // RTL8185
-       VERSION_8185_UNKNOWN,
-       VERSION_8185_C, // C-cut
-       VERSION_8185_D, // D-cut
-       // RTL8185B
-       VERSION_8185B_B, // B-cut
-       VERSION_8185B_D, // D-cut
-       VERSION_8185B_E, // E-cut
-       //RTL8187S-PCIE
-       VERSION_8187S_B, // B-cut
-       VERSION_8187S_C, // C-cut
-       VERSION_8187S_D, // D-cut
-
-}VERSION_8185,*PVERSION_8185;
 typedef struct         ChnlAccessSetting {
        u16 SIFS_Timer;
        u16 DIFS_Timer;
@@ -341,11 +326,8 @@ typedef struct r8180_priv
        int irq;
        struct ieee80211_device *ieee80211;
 
-        short card_8185; /* O: rtl8180, 1:rtl8185 V B/C, 2:rtl8185 V D, 3:rtl8185B */
-       short card_8185_Bversion; /* if TCR reports card V B/C this discriminates */
        short phy_ver; /* meaningful for rtl8225 1:A 2:B 3:C */
        short enable_gpio0;
-       enum card_type {PCI,MINIPCI,CARDBUS,USB/*rtl8187*/}card_type;
        short hw_plcp_len;
        short plcp_preamble_mode; // 0:auto 1:short 2:long
 
@@ -521,7 +503,7 @@ typedef struct r8180_priv
        //u32 NumTxOkInPeriod;   //YJ,del,080828
        u8   TxPollingTimes;
 
-       bool    bApBufOurFrame;// TRUE if AP buffer our unicast data , we will keep eAwake untill receive data or timeout.
+       bool    bApBufOurFrame;// TRUE if AP buffer our unicast data , we will keep eAwake until receive data or timeout.
        u8      WaitBufDataBcnCount;
        u8      WaitBufDataTimeOut;
 
@@ -599,7 +581,7 @@ typedef struct r8180_priv
        u8                                              RSSI;
        char                                    RxPower;
         u8 InitialGain;
-        //For adjust Dig Threshhold during Legacy/Leisure Power Save Mode
+        //For adjust Dig Threshold during Legacy/Leisure Power Save Mode
        u32                             DozePeriodInPast2Sec;
         // Don't access BB/RF under disable PLL situation.
        u8                                      InitialGainBackUp;