diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rtl8187se/r8180_dm.h | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
| download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8187se/r8180_dm.h')
| -rw-r--r-- | drivers/staging/rtl8187se/r8180_dm.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/rtl8187se/r8180_dm.h b/drivers/staging/rtl8187se/r8180_dm.h index 84f4672..b775825 100644 --- 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); |
