diff --git a/[refs] b/[refs] index a05de32d5141..98272b42edf2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1b0925293190338add127b02a833d16f6af05ad +refs/heads/master: 888b9de56b06402892733194218d1170a024124b diff --git a/trunk/drivers/staging/rtl8187se/r8180_dm.h b/trunk/drivers/staging/rtl8187se/r8180_dm.h index 84f46728c3de..b7758254ad76 100644 --- a/trunk/drivers/staging/rtl8187se/r8180_dm.h +++ b/trunk/drivers/staging/rtl8187se/r8180_dm.h @@ -2,17 +2,17 @@ #define R8180_DM_H #include "r8180.h" -//#include "r8180_hw.h" -//#include "r8180_93cx6.h" +/* #include "r8180_hw.h" */ +/* #include "r8180_93cx6.h" */ void SwAntennaDiversityRxOk8185(struct net_device *dev, u8 SignalStrength); bool SetAntenna8185(struct net_device *dev, u8 u1bAntennaIndex); -bool SwitchAntenna( struct net_device *dev); -void SwAntennaDiversity(struct net_device *dev ); +bool SwitchAntenna(struct net_device *dev); +void SwAntennaDiversity(struct net_device *dev); void SwAntennaDiversityTimerCallback(struct net_device *dev); bool CheckDig(struct net_device *dev); bool CheckHighPower(struct net_device *dev); -void rtl8180_hw_dig_wq (struct work_struct *work); -void rtl8180_tx_pw_wq (struct work_struct *work); +void rtl8180_hw_dig_wq(struct work_struct *work); +void rtl8180_tx_pw_wq(struct work_struct *work); void rtl8180_rate_adapter(struct work_struct * work); void TxPwrTracking87SE(struct net_device *dev); bool CheckTxPwrTracking(struct net_device *dev);