diff --git a/[refs] b/[refs]
index c04c39c6b040..3fa836d4906b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc79cad299395f11a5df9da0d6a8991a118f2b81
+refs/heads/master: 7848789cbf006127bde475b15b79c5db1be6b2db
diff --git a/trunk/drivers/staging/brcm80211/include/typedefs.h b/trunk/drivers/staging/brcm80211/include/typedefs.h
index 28ecbab0c2d1..7e4bec9d123e 100644
--- a/trunk/drivers/staging/brcm80211/include/typedefs.h
+++ b/trunk/drivers/staging/brcm80211/include/typedefs.h
@@ -17,6 +17,8 @@
 #ifndef _TYPEDEFS_H_
 #define _TYPEDEFS_H_
 
+#include <linux/types.h>
+
 /*
  * Infer the compile environment based on preprocessor symbols and pragmas.
  * Override type definitions as needed, and include configuration-dependent
@@ -31,7 +33,6 @@ typedef unsigned long long int uintptr;
 #define TYPEDEF_UINT
 #define TYPEDEF_USHORT
 #define TYPEDEF_ULONG
-#include <linux/types.h>
 
 /*
  * Default Typedefs