diff --git a/[refs] b/[refs]
index 2284bc246f16..c44c98c17779 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 629dcf23dffcf90f2104784d4ad9324ab3a1f2ef
+refs/heads/master: 770238bf56f833291f7df445ef0678d20ca995c9
diff --git a/trunk/drivers/staging/cx25821/cx25821-cards.c b/trunk/drivers/staging/cx25821/cx25821-cards.c
index 4d0b9eac3e49..da0f56d50e27 100644
--- a/trunk/drivers/staging/cx25821/cx25821-cards.c
+++ b/trunk/drivers/staging/cx25821/cx25821-cards.c
@@ -30,12 +30,12 @@
 #include "cx25821.h"
 #include "tuner-xc2028.h"
 
-// board config info
+/* board config info */
 
 struct cx25821_board cx25821_boards[] = {
 	[UNKNOWN_BOARD] = {
 			   .name = "UNKNOWN/GENERIC",
-			   // Ensure safe default for unknown boards
+			   /* Ensure safe default for unknown boards */
 			   .clk_freq = 0,
 			   },