diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/rtl8192su/r8192S_phy.h | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
| download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/rtl8192su/r8192S_phy.h')
| -rw-r--r-- | drivers/staging/rtl8192su/r8192S_phy.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/rtl8192su/r8192S_phy.h b/drivers/staging/rtl8192su/r8192S_phy.h index 580a7c6..b752fa3 100644 --- a/drivers/staging/rtl8192su/r8192S_phy.h +++ b/drivers/staging/rtl8192su/r8192S_phy.h @@ -121,11 +121,8 @@ extern void PHY_IQCalibrateBcut(struct net_device* dev); extern void PHY_IQCalibrate(struct net_device* dev); extern void PHY_GetHWRegOriginalValue(struct net_device* dev); -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)) extern void InitialGainOperateWorkItemCallBack(struct work_struct *work); -#else -extern void InitialGainOperateWorkItemCallBack(struct net_device *dev); -#endif + void PHY_SetTxPowerLevel8192S(struct net_device* dev, u8 channel); void PHY_InitialGain8192S(struct net_device* dev,u8 Operation ); |