diff --git a/[refs] b/[refs]
index a497b6082883..cb44916ef198 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06e9509ff3484578c111bbc6f9e0e97c086a1131
+refs/heads/master: 80c6e358c1b6da0b9aa97e10c82317b7104821bb
diff --git a/trunk/drivers/media/video/au0828/au0828-video.c b/trunk/drivers/media/video/au0828/au0828-video.c
index 5de968e128f6..d3a388af46e7 100644
--- a/trunk/drivers/media/video/au0828/au0828-video.c
+++ b/trunk/drivers/media/video/au0828/au0828-video.c
@@ -1427,6 +1427,7 @@ static int vidioc_streamoff(struct file *file, void *priv,
 	return 0;
 }
 
+#ifdef CONFIG_VIDEO_ADV_DEBUG
 static int vidioc_g_register(struct file *file, void *priv,
 			     struct v4l2_dbg_register *reg)
 {
@@ -1457,6 +1458,7 @@ static int vidioc_s_register(struct file *file, void *priv,
 	}
 	return 0;
 }
+#endif
 
 static int vidioc_reqbufs(struct file *file, void *priv,
 			  struct v4l2_requestbuffers *rb)
@@ -1578,8 +1580,8 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
 #ifdef CONFIG_VIDEO_ADV_DEBUG
 	.vidioc_g_register          = vidioc_g_register,
 	.vidioc_s_register          = vidioc_s_register,
-	.vidioc_g_chip_ident        = vidioc_g_chip_ident,
 #endif
+	.vidioc_g_chip_ident        = vidioc_g_chip_ident,
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
 	.vidiocgmbuf                = vidiocgmbuf,
 #endif