Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-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 3de92f040f99abf3f30a06066f68a756c7e3bb40..84f46728c3def7b9cd692f63ec1f94f130524439 100644 (file)
--- a/drivers/staging/rtl8187se/r8180_dm.h
+++ b/drivers/staging/rtl8187se/r8180_dm.h
@@ -1,41 +1,23 @@
-#ifndef R8180_DM_H \r
-#define R8180_DM_H\r
-\r
-#include "r8180.h"\r
-//#include "r8180_hw.h"\r
-//#include "r8180_93cx6.h"\r
-void SwAntennaDiversityRxOk8185(struct net_device *dev, u8 SignalStrength);\r
-bool SetAntenna8185(struct net_device *dev,    u8 u1bAntennaIndex);\r
-bool SwitchAntenna(    struct net_device *dev);\r
-void SwAntennaDiversity(struct net_device *dev );\r
-void SwAntennaDiversityTimerCallback(struct net_device *dev);\r
-bool CheckDig(struct net_device *dev);\r
-bool CheckHighPower(struct net_device *dev);\r
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))\r
-void rtl8180_hw_dig_wq (struct work_struct *work);\r
-#else\r
-void rtl8180_hw_dig_wq(struct net_device *dev);\r
-#endif\r
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))\r
-void rtl8180_tx_pw_wq (struct work_struct *work);\r
-#else\r
-void rtl8180_tx_pw_wq(struct net_device *dev);\r
-#endif\r
-#if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,20)\r
-void rtl8180_rate_adapter(struct work_struct * work);\r
-\r
-#else\r
-void rtl8180_rate_adapter(struct net_device *dev);\r
-\r
-#endif\r
-void TxPwrTracking87SE(struct net_device *dev);\r
-bool CheckTxPwrTracking(struct net_device *dev);\r
-#if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,20)\r
-void rtl8180_rate_adapter(struct work_struct * work);\r
-#else\r
-void rtl8180_rate_adapter(struct net_device *dev);\r
-#endif\r
-void timer_rate_adaptive(unsigned long data);\r
-\r
-\r
-#endif\r
+#ifndef R8180_DM_H
+#define R8180_DM_H
+
+#include "r8180.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 );
+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_rate_adapter(struct work_struct * work);
+void TxPwrTracking87SE(struct net_device *dev);
+bool CheckTxPwrTracking(struct net_device *dev);
+void rtl8180_rate_adapter(struct work_struct * work);
+void timer_rate_adaptive(unsigned long data);
+
+
+#endif