diff --git a/[refs] b/[refs]
index 752f3dcea57d..a5b4c067e1ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24dec5dabfcc1d424d7bc86d393d31f57ebcc975
+refs/heads/master: b4c13d3df1dfabac3d7737924a0dec665a971484
diff --git a/trunk/drivers/media/pci/saa7164/saa7164-encoder.c b/trunk/drivers/media/pci/saa7164/saa7164-encoder.c
index 994018e2d0d6..9bb0903ee5f1 100644
--- a/trunk/drivers/media/pci/saa7164/saa7164-encoder.c
+++ b/trunk/drivers/media/pci/saa7164/saa7164-encoder.c
@@ -1298,6 +1298,7 @@ static int saa7164_g_chip_ident(struct file *file, void *fh,
 	return 0;
 }
 
+#ifdef CONFIG_VIDEO_ADV_DEBUG
 static int saa7164_g_register(struct file *file, void *fh,
 			      struct v4l2_dbg_register *reg)
 {
@@ -1323,6 +1324,7 @@ static int saa7164_s_register(struct file *file, void *fh,
 
 	return 0;
 }
+#endif
 
 static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {
 	.vidioc_s_std		 = vidioc_s_std,