diff --git a/[refs] b/[refs]
index 3fa836d4906b..decf1c77e19d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7848789cbf006127bde475b15b79c5db1be6b2db
+refs/heads/master: 151da5a562b9ddbe57dcbd24cb3d855faf843516
diff --git a/trunk/drivers/staging/brcm80211/include/typedefs.h b/trunk/drivers/staging/brcm80211/include/typedefs.h
index 7e4bec9d123e..10cb839083c7 100644
--- a/trunk/drivers/staging/brcm80211/include/typedefs.h
+++ b/trunk/drivers/staging/brcm80211/include/typedefs.h
@@ -70,10 +70,6 @@ typedef unsigned short uint16;
 typedef unsigned int uint32;
 #endif
 
-#ifndef TYPEDEF_UINT64
-typedef unsigned long long uint64;
-#endif
-
 #ifndef TYPEDEF_UINTPTR
 typedef unsigned int uintptr;
 #endif
@@ -90,11 +86,6 @@ typedef signed short int16;
 typedef signed int int32;
 #endif
 
-#ifndef TYPEDEF_INT64
-typedef signed long long int64;
-#endif
-
-
 /* define macro values */
 
 #ifndef FALSE
@@ -126,12 +117,10 @@ typedef signed long long int64;
 #undef TYPEDEF_UINT8
 #undef TYPEDEF_UINT16
 #undef TYPEDEF_UINT32
-#undef TYPEDEF_UINT64
 #undef TYPEDEF_UINTPTR
 #undef TYPEDEF_INT8
 #undef TYPEDEF_INT16
 #undef TYPEDEF_INT32
-#undef TYPEDEF_INT64
 #undef TYPEDEF_FLOAT32
 #undef TYPEDEF_FLOAT64
 #undef TYPEDEF_FLOAT_T