diff --git a/[refs] b/[refs]
index baba545d7530..a3c6fb340a1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11465f6a7d43f3584fa6ee4a619a25d944c7af8d
+refs/heads/master: 4128dd9afb986321edf0baa8a3aaa3c7c5aa3730
diff --git a/trunk/drivers/staging/brcm80211/include/typedefs.h b/trunk/drivers/staging/brcm80211/include/typedefs.h
index 076d95b84932..a6ab298c4d31 100644
--- a/trunk/drivers/staging/brcm80211/include/typedefs.h
+++ b/trunk/drivers/staging/brcm80211/include/typedefs.h
@@ -90,9 +90,6 @@ typedef signed int int32;
 #undef TYPEDEF_UINTPTR
 #undef TYPEDEF_INT16
 #undef TYPEDEF_INT32
-#undef TYPEDEF_FLOAT32
-#undef TYPEDEF_FLOAT64
-#undef TYPEDEF_FLOAT_T
 
 /*
  * Including the bcmdefs.h here, to make sure everyone including typedefs.h