Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[mv-sheeva.git] / drivers / staging / rtl8192su / r8192S_phy.h

diff --git a/drivers/staging/rtl8192su/r8192S_phy.h b/drivers/staging/rtl8192su/r8192S_phy.h
index 580a7c6a7609307cfa3f646eabac4b8b0c5d32cb..b752fa35a7aee4ebcf4c235bba4989ecf1612c32 100644 (file)
--- 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   );