diff --git a/[refs] b/[refs]
index 24f016fc9ec0..b1708c2f7fc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c246412117d871a3a90cd4e8ba2c6dea18a59f71
+refs/heads/master: 5f40d915521f5a8ae4551a21871a062201ba9981
diff --git a/trunk/drivers/media/video/pwc/pwc.h b/trunk/drivers/media/video/pwc/pwc.h
index 33863b91461c..421e75b69f29 100644
--- a/trunk/drivers/media/video/pwc/pwc.h
+++ b/trunk/drivers/media/video/pwc/pwc.h
@@ -259,10 +259,6 @@ struct pwc_device
 #endif
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Global variables */
 #ifdef CONFIG_USB_PWC_DEBUG
 extern int pwc_trace;
@@ -340,10 +336,4 @@ extern const struct v4l2_ioctl_ops pwc_ioctl_ops;
 /* Expand frame to image, possibly including decompression. Uses read_frame and fill_image */
 extern int pwc_decompress(struct pwc_device *pdev);
 
-#ifdef __cplusplus
-}
-#endif
-
-
 #endif
-/* vim: set cino= formatoptions=croql cindent shiftwidth=8 tabstop=8: */