diff --git a/[refs] b/[refs] index df0a126c3629..5d87feaed172 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c53d201371bf45cdb5b843ade52edd8903bb72f6 +refs/heads/master: c10407ac459577f6b58f3db0777b6d0d53a3be9f diff --git a/trunk/drivers/staging/brcm80211/include/osl.h b/trunk/drivers/staging/brcm80211/include/osl.h index 186bb77b7623..662b5197b374 100644 --- a/trunk/drivers/staging/brcm80211/include/osl.h +++ b/trunk/drivers/staging/brcm80211/include/osl.h @@ -56,11 +56,4 @@ typedef void (*osl_wreg_fn_t) (void *ctx, void *reg, unsigned int val, #define OR_REG(osh, r, v) W_REG(osh, (r), R_REG(osh, r) | (v)) #endif /* !OR_REG */ -#if !defined(OSL_SYSUPTIME) -#define OSL_SYSUPTIME() (0) -#define OSL_SYSUPTIME_SUPPORT false -#else -#define OSL_SYSUPTIME_SUPPORT true -#endif /* OSL_SYSUPTIME */ - #endif /* _osl_h_ */