diff --git a/[refs] b/[refs]
index 14efb622b428..fe4054642b1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bafbb8df076de1e3b63914473a403fba96b88f3c
+refs/heads/master: df880a42dc4086ba7ff16f6ccb255e78fc0dc374
diff --git a/trunk/drivers/staging/brcm80211/include/osl.h b/trunk/drivers/staging/brcm80211/include/osl.h
index 662b5197b374..c2fa2975c955 100644
--- a/trunk/drivers/staging/brcm80211/include/osl.h
+++ b/trunk/drivers/staging/brcm80211/include/osl.h
@@ -38,22 +38,10 @@ typedef struct osl_dmainfo osldma_t;
 typedef unsigned int (*osl_rreg_fn_t) (void *ctx, void *reg, unsigned int size);
 typedef void (*osl_wreg_fn_t) (void *ctx, void *reg, unsigned int val,
 			       unsigned int size);
-#endif
+#endif /* BCMSDIO */
 
 #include <linux_osl.h>
 
-/* --------------------------------------------------------------------------
-** Register manipulation macros.
-*/
-
 #define	SET_REG(osh, r, mask, val)	W_REG((osh), (r), ((R_REG((osh), r) & ~(mask)) | (val)))
 
-#ifndef AND_REG
-#define AND_REG(osh, r, v)		W_REG(osh, (r), R_REG(osh, r) & (v))
-#endif				/* !AND_REG */
-
-#ifndef OR_REG
-#define OR_REG(osh, r, v)		W_REG(osh, (r), R_REG(osh, r) | (v))
-#endif				/* !OR_REG */
-
-#endif				/* _osl_h_ */
+#endif /* _osl_h_ */