diff --git a/[refs] b/[refs]
index 29186cfc5128..af3fb37aec8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6279bc9e4dfb30bef8e3e1f41df8e877ecd3e30
+refs/heads/master: 37a110c04965e23e12bf00370e9ec61e99cc25b8
diff --git a/trunk/drivers/staging/comedi/comedi.h b/trunk/drivers/staging/comedi/comedi.h
index 957b6405dfa7..ccc5cdc008c6 100644
--- a/trunk/drivers/staging/comedi/comedi.h
+++ b/trunk/drivers/staging/comedi/comedi.h
@@ -24,10 +24,6 @@
 #ifndef _COMEDI_H
 #define _COMEDI_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define COMEDI_MAJORVERSION	0
 #define COMEDI_MINORVERSION	7
 #define COMEDI_MICROVERSION	76
@@ -871,8 +867,4 @@ INSN_CONFIG_ARM */
 		AMPLC_DIO_GAT_RESERVED7
 	};
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* _COMEDI_H */