Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux...

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

diff --git a/drivers/staging/rtl8187se/r8180.h b/drivers/staging/rtl8187se/r8180.h
index ce828885b64f755f7d69914b2710a886a1dfe1f3..d15bdf64efd0f7865612382bdb542c0d5274836c 100644 (file)
--- a/drivers/staging/rtl8187se/r8180.h
+++ b/drivers/staging/rtl8187se/r8180.h
@@ -366,7 +366,6 @@ typedef struct r8180_priv
        short diversity;
        u8 cs_treshold;
        short rcr_csense;
-       short rf_chip;
        u32 key0[4];
        short (*rf_set_sens)(struct net_device *dev,short sens);
        void (*rf_set_chan)(struct net_device *dev,short ch);
@@ -479,9 +478,6 @@ typedef struct r8180_priv
        u8 retry_rts;
        u16 rts;
 
-//add for RF power on power off by lizhaoming 080512
-       u8       RegThreeWireMode; // See "Three wire mode" defined above, 2006.05.31, by rcnjko.
-
 //by amy for led
        LED_STRATEGY_8185 LedStrategy;
 //by amy for led