diff options
| author | Gianluca Gennari <gennarone@gmail.com> | 2013-03-07 10:19:29 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-14 08:45:55 -0400 |
| commit | 9bb05696af3f808c3ad684c9fcf4b870ddbff804 (patch) | |
| tree | d227fd90e1ba84b34059c84ceab7fde6ffb7b026 | |
| parent | 457ba4ce4f435d0b4dd82a0acc6c796e541a2ea7 (diff) | |
[media] cx231xx: fix undefined function cx231xx_g_chip_ident()
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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c index 41c5c996ed2c..ac6200870a62 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, | |||
| 1227 | return rc; | 1227 | return rc; |
| 1228 | } | 1228 | } |
| 1229 | 1229 | ||
| 1230 | int vidioc_g_chip_ident(struct file *file, void *fh, | 1230 | int cx231xx_g_chip_ident(struct file *file, void *fh, |
| 1231 | struct v4l2_dbg_chip_ident *chip) | 1231 | struct v4l2_dbg_chip_ident *chip) |
| 1232 | { | 1232 | { |
| 1233 | chip->ident = V4L2_IDENT_NONE; | 1233 | chip->ident = V4L2_IDENT_NONE; |