diff --git a/[refs] b/[refs]
index 3a116fa9fa11..16bfde14afda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 449c6741b69cb745214f1b62e188852f28c79332
+refs/heads/master: efd89a2204d4086de48673ff7e4d5f537e32e0a5
diff --git a/trunk/drivers/staging/brcm80211/Makefile b/trunk/drivers/staging/brcm80211/Makefile
index 31922e338b65..68cbcbbc2e56 100644
--- a/trunk/drivers/staging/brcm80211/Makefile
+++ b/trunk/drivers/staging/brcm80211/Makefile
@@ -27,11 +27,7 @@ ccflags-y :=					\
 	-Idrivers/staging/brcm80211/sys		\
 	-Idrivers/staging/brcm80211/phy		\
 	-Idrivers/staging/brcm80211/util	\
-	-Idrivers/staging/brcm80211/include	\
-	-Wall					\
-	-Wstrict-prototypes			\
-	-Werror					\
-	-Wmissing-prototypes
+	-Idrivers/staging/brcm80211/include
 
 PCI_CFLAGS := -DWLC_LOW
 
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/Makefile b/trunk/drivers/staging/brcm80211/brcmfmac/Makefile
index b31f24d43693..09196e9789e5 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/Makefile
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/Makefile
@@ -36,9 +36,6 @@ ccflags-y :=			\
 	-DDHD_GPL		\
 	-DBCMLXSDMMC		\
 	-DBCMPLATFORM_BUS	\
-	-Wall			\
-	-Wstrict-prototypes	\
-	-Werror			\
 	-DOEM_CHROMIUMOS	\
 	-DEMBEDDED_PLATFORM	\
 	-DARP_OFFLOAD_SUPPORT	\