diff --git a/[refs] b/[refs]
index d872e942cae4..f47fa3b8ffe3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22b564b0b6909664bd7adac2fa9f3f0abc46457a
+refs/heads/master: a6cf450e02c0a6a7178e2f8fb9d56bfd829e012b
diff --git a/trunk/drivers/staging/brcm80211/include/bcmutils.h b/trunk/drivers/staging/brcm80211/include/bcmutils.h
index 07948b85e8a9..dcb02367d5d6 100644
--- a/trunk/drivers/staging/brcm80211/include/bcmutils.h
+++ b/trunk/drivers/staging/brcm80211/include/bcmutils.h
@@ -17,10 +17,6 @@
 #ifndef	_bcmutils_h_
 #define	_bcmutils_h_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Buffer structure for collecting string-formatted data
 * using bcm_bprintf() API.
 * Use bcm_binit() to initialize before use
@@ -513,8 +509,4 @@ extern "C" {
 				uint len);
 	extern uint bcm_bitcount(u8 *bitmap, uint bytelength);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif				/* _bcmutils_h_ */