diff --git a/[refs] b/[refs]
index c64e87ebbd07..46dfbbd34bbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f07639adebd573709ea0d6b67bec9b620fe3083e
+refs/heads/master: 6675fe3f92ad3b433e55744ef96d775b4875997e
diff --git a/trunk/drivers/staging/echo/bit_operations.h b/trunk/drivers/staging/echo/bit_operations.h
index b32f4bf99397..04b55d2aba59 100644
--- a/trunk/drivers/staging/echo/bit_operations.h
+++ b/trunk/drivers/staging/echo/bit_operations.h
@@ -30,10 +30,6 @@
 #if !defined(_BIT_OPERATIONS_H_)
 #define _BIT_OPERATIONS_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #if defined(__i386__)  ||  defined(__x86_64__)
 /*! \brief Find the bit position of the highest set bit in a word
     \param bits The word to be searched
@@ -245,9 +241,5 @@ static __inline__ int parity32(uint32_t x)
 }
 /*- End of function --------------------------------------------------------*/
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
 /*- End of file ------------------------------------------------------------*/
diff --git a/trunk/drivers/staging/echo/fir.h b/trunk/drivers/staging/echo/fir.h
index 19c20cde186b..d1df33cf2aa5 100644
--- a/trunk/drivers/staging/echo/fir.h
+++ b/trunk/drivers/staging/echo/fir.h
@@ -105,10 +105,6 @@ typedef struct
 	float *history;
 } fir_float_state_t;
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 static __inline__ const int16_t *fir16_create(fir16_state_t *fir,
                                               const int16_t *coeffs,
                                               int taps)
@@ -312,9 +308,5 @@ static __inline__ int16_t fir32(fir32_state_t *fir, int16_t sample)
 }
 /*- End of function --------------------------------------------------------*/
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
 /*- End of file ------------------------------------------------------------*/