--- drivers/net/wireless/bcmdhd/include/linux_osl.h

+++ drivers/net/wireless/bcmdhd/include/linux_osl.h

@@ -21,7 +21,7 @@

* software in any way with any other Broadcom software provided under a license

* other than the GPL, without Broadcom's express prior written consent.

*

- * $Id: linux_osl.h 352246 2012-08-22 05:42:04Z $

+ * $Id: linux_osl.h 354452 2012-08-31 04:59:17Z $

*/

#ifndef _linux_osl_h_

@@ -165,8 +165,11 @@ extern int osl_error(int bcmerror);

#include <linuxver.h>

#include <linux/kernel.h>

#include <linux/string.h>

-

+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 29)

#define OSL_SYSUPTIME() ((uint32)jiffies_to_msecs(jiffies))

+#else

+#define OSL_SYSUPTIME() ((uint32)jiffies * (1000 / HZ))

+#endif

#define printf(fmt, args...) printk(fmt , ## args)

#include <linux/kernel.h>

#include <linux/string.h>