diff --git a/[refs] b/[refs]
index ecf275455a44..d4592c3f0a39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de9bca6377e18d3a41cc19d5b2ef118934702b33
+refs/heads/master: 3bc4d4922ac80f551c6f314dab101c828fc492b4
diff --git a/trunk/drivers/staging/brcm80211/include/typedefs.h b/trunk/drivers/staging/brcm80211/include/typedefs.h
index 6e43f8872779..96d4cdb42bec 100644
--- a/trunk/drivers/staging/brcm80211/include/typedefs.h
+++ b/trunk/drivers/staging/brcm80211/include/typedefs.h
@@ -58,10 +58,6 @@ typedef unsigned long ulong;
 
 /* define [u]int8/16/32/64, uintptr */
 
-#ifndef TYPEDEF_UINT8
-typedef unsigned char uint8;
-#endif
-
 #ifndef TYPEDEF_UINT16
 typedef unsigned short uint16;
 #endif
@@ -110,7 +106,6 @@ typedef signed int int32;
 #undef TYPEDEF_USHORT
 #undef TYPEDEF_UINT
 #undef TYPEDEF_ULONG
-#undef TYPEDEF_UINT8
 #undef TYPEDEF_UINT16
 #undef TYPEDEF_UINT32
 #undef TYPEDEF_UINTPTR