diff --git a/[refs] b/[refs]
index 16c0af14a1dd..873e5e22a4a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 326a67977c15715d627525deade9e859f5cd5646
+refs/heads/master: e63449b7171fa19d1d2404179665d5ed146e8990
diff --git a/trunk/drivers/staging/brcm80211/include/osl.h b/trunk/drivers/staging/brcm80211/include/osl.h
index c99920b52e9d..54fdfd609729 100644
--- a/trunk/drivers/staging/brcm80211/include/osl.h
+++ b/trunk/drivers/staging/brcm80211/include/osl.h
@@ -29,15 +29,6 @@ struct osl_info {
 typedef struct osl_dmainfo osldma_t;
 
 
-#ifdef BCMSDIO
-/* Drivers use REGOPSSET() to register register read/write funcitons */
-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 /* BCMSDIO */
-
-#include <linux/skbuff.h>
-
 extern struct osl_info *osl_attach(void *pdev, uint bustype);
 extern void osl_detach(struct osl_info *osh);