diff --git a/[refs] b/[refs]
index 0c320e2a8e5e..7a228d9aaec0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 457ba4ce4f435d0b4dd82a0acc6c796e541a2ea7
+refs/heads/master: 9bb05696af3f808c3ad684c9fcf4b870ddbff804
diff --git a/trunk/drivers/media/usb/cx231xx/cx231xx-video.c b/trunk/drivers/media/usb/cx231xx/cx231xx-video.c
index 41c5c996ed2c..ac6200870a62 100644
--- a/trunk/drivers/media/usb/cx231xx/cx231xx-video.c
+++ b/trunk/drivers/media/usb/cx231xx/cx231xx-video.c
@@ -1227,7 +1227,7 @@ int cx231xx_s_frequency(struct file *file, void *priv,
 	return rc;
 }
 
-int vidioc_g_chip_ident(struct file *file, void *fh,
+int cx231xx_g_chip_ident(struct file *file, void *fh,
 			struct v4l2_dbg_chip_ident *chip)
 {
 	chip->ident = V4L2_IDENT_NONE;