diff --git a/[refs] b/[refs]
index e11fba86a99c..c5f4bc01686d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4f63e9a0f1ca7c6df1f77fdabd4905f4639e8c6
+refs/heads/master: 3dbab7331209d5d85c448675053d3e9e7a4bcd41
diff --git a/trunk/drivers/staging/easycap/easycap.h b/trunk/drivers/staging/easycap/easycap.h
index 26bb25f7fe7c..360653cf7c7f 100644
--- a/trunk/drivers/staging/easycap/easycap.h
+++ b/trunk/drivers/staging/easycap/easycap.h
@@ -42,8 +42,8 @@
  */
 /*---------------------------------------------------------------------------*/
 
-#if (!defined(EASYCAP_H))
-#define EASYCAP_H
+#ifndef __EASYCAP_H__
+#define __EASYCAP_H__
 
 /*---------------------------------------------------------------------------*/
 /*
@@ -746,4 +746,4 @@ extern struct usb_class_driver easyoss_class;
 extern const struct file_operations easyoss_fops;
 #endif /*EASYCAP_NEEDS_ALSA*/
 
-#endif /*EASYCAP_H*/
+#endif /* !__EASYCAP_H__  */