diff --git a/[refs] b/[refs]
index b72bf95a9155..07157ebdf9ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f37fdf3ff744bffc35a8f1b9d7d655d8d88a0404
+refs/heads/master: 438468359e1db16a7d1925fc4f2519a044bbf7dd
diff --git a/trunk/drivers/media/video/bt8xx/bttv-driver.c b/trunk/drivers/media/video/bt8xx/bttv-driver.c
index ddca21d9c948..907dc62c1783 100644
--- a/trunk/drivers/media/video/bt8xx/bttv-driver.c
+++ b/trunk/drivers/media/video/bt8xx/bttv-driver.c
@@ -3402,8 +3402,10 @@ static struct video_device bttv_video_template =
 	.vidioc_s_frequency             = bttv_s_frequency,
 	.vidioc_log_status		= bttv_log_status,
 	.vidioc_querystd		= bttv_querystd,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
 	.vidioc_g_register		= bttv_g_register,
 	.vidioc_s_register		= bttv_s_register,
+#endif
 	.tvnorms                        = BTTV_NORMS,
 	.current_norm                   = V4L2_STD_PAL,
 };