Merge branch 'fixes-rc1' into omap-for-v4.2/fixes

[firefly-linux-kernel-4.4.55.git] / drivers / staging / wilc1000 / wilc_timer.h

diff --git a/drivers/staging/wilc1000/wilc_timer.h b/drivers/staging/wilc1000/wilc_timer.h
index 72b27155293ed8ac83a577c42db8b833a3c17fd6..931269db3194a26d43723d33722c08d370734099 100644 (file)
--- a/drivers/staging/wilc1000/wilc_timer.h
+++ b/drivers/staging/wilc1000/wilc_timer.h
@@ -10,6 +10,9 @@
  *  @version   1.0
  */
 
+#include "wilc_platform.h"
+#include "wilc_errorsupport.h"
+
 typedef void (*tpfWILC_TimerFunction)(void *);
 
 /*!
@@ -82,8 +85,8 @@ WILC_ErrNo WILC_TimerDestroy(WILC_TimerHandle *pHandle,
  *  @details   This function will move the timer to the PENDING state until the
  *              given time expires (in msec) then the callback function will be
  *              executed (timer in EXECUTING state) after execution is dene the
- *              timer either goes to IDLE (if bPeriodicTimer==WILC_FALSE) or
- *              PENDING with same timeout value (if bPeriodicTimer==WILC_TRUE)
+ *              timer either goes to IDLE (if bPeriodicTimer==false) or
+ *              PENDING with same timeout value (if bPeriodicTimer==true)
  *  @param[in] pHandle handle to the timer object
  *  @param[in] u32Timeout timeout value in msec after witch the callback
  *              function will be executed. Timeout value of 0 is not allowed for
@@ -96,7 +99,7 @@ WILC_ErrNo WILC_TimerDestroy(WILC_TimerHandle *pHandle,
  *  @date      16 Aug 2010
  *  @version   1.0
  */
-WILC_ErrNo WILC_TimerStart(WILC_TimerHandle *pHandle, WILC_Uint32 u32Timeout, void *pvArg,
+WILC_ErrNo WILC_TimerStart(WILC_TimerHandle *pHandle, u32 u32Timeout, void *pvArg,
                           tstrWILC_TimerAttrs *pstrAttrs);