diff --git a/[refs] b/[refs]
index eacfac58109e..6cf44a47bca0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d44661ad1f6336345a9f7765afef6d0aeac543e
+refs/heads/master: 98ede2ed46cef38e98c8341d410323895f60570e
diff --git a/trunk/drivers/staging/brcm80211/include/osl.h b/trunk/drivers/staging/brcm80211/include/osl.h
index 2368c80db60a..b543bbbae3da 100644
--- a/trunk/drivers/staging/brcm80211/include/osl.h
+++ b/trunk/drivers/staging/brcm80211/include/osl.h
@@ -128,8 +128,6 @@ extern void osl_dma_unmap(struct osl_info *osh, uint pa, uint size,
 #define	bcopy(src, dst, len)	memcpy((dst), (src), (len))
 
 /* register access macros */
-#if defined(OSLREGOPS)
-#else
 #ifndef IL_BIGENDIAN
 #ifndef __mips__
 #define R_REG(osh, r) (\
@@ -220,8 +218,6 @@ extern void osl_dma_unmap(struct osl_info *osh, uint pa, uint size,
 	} while (0)
 #endif				/* IL_BIGENDIAN */
 
-#endif				/* OSLREGOPS */
-
 #define	AND_REG(osh, r, v)		W_REG(osh, (r), R_REG(osh, r) & (v))
 #define	OR_REG(osh, r, v)		W_REG(osh, (r), R_REG(osh, r) | (v))