Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/staging/rtl8187se/r8180_dm.h b/drivers/staging/rtl8187se/r8180_dm.h
index 84f46728c3def7b9cd692f63ec1f94f130524439..b7758254ad76d940f13727ee6d45e668148693b9 100644 (file)
--- a/drivers/staging/rtl8187se/r8180_dm.h
+++ b/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);