diff mbox

cx231xx: fix undefined function cx231xx_g_chip_ident()

Message ID 1362673169-23668-1-git-send-email-gennarone@gmail.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Gianluca Gennari March 7, 2013, 4:19 p.m. UTC 
  This patch:
http://git.linuxtv.org/media_tree.git/commit/b86d15440b683f8634c0cb26fc0861a5bc4913ac
is missing a chunk when compared to an older version:
https://patchwork.kernel.org/patch/2063281/
probably because of an unresolved merging conflict.
This causes the following error: 
WARNING: "cx231xx_g_chip_ident" [/home/jena/media_build/v4l/cx231xx.ko] undefined!

Signed-off-by: Gianluca Gennari <gennarone@gmail.com>
---
 drivers/media/usb/cx231xx/cx231xx-video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox

Patch

diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
index 41c5c99..ac62008 100644
--- a/drivers/media/usb/cx231xx/cx231xx-video.c
+++ b/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;