diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 09:36:07 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 09:36:07 -0300 |
| commit | 7abbab1a9801ad11729cc746653a909972548502 (patch) | |
| tree | 232a3bbdbf4c48b602848b9b0031b79e734fc599 /linux/drivers/media/video/cafe_ccic.c | |
| parent | ec810366b1dc73c6e1e9251b2bf21135e42d9fc7 (diff) | |
| parent | 619f91291de90dbff3aaafdf29a3886757eda34f (diff) | |
| download | mediapointer-dvb-s2-7abbab1a9801ad11729cc746653a909972548502.tar.gz mediapointer-dvb-s2-7abbab1a9801ad11729cc746653a909972548502.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-videodev2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cafe_ccic.c')
| -rw-r--r-- | linux/drivers/media/video/cafe_ccic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cafe_ccic.c b/linux/drivers/media/video/cafe_ccic.c index b75c151cc..075d57031 100644 --- a/linux/drivers/media/video/cafe_ccic.c +++ b/linux/drivers/media/video/cafe_ccic.c @@ -26,6 +26,7 @@ #include <linux/videodev2.h> #include "compat.h" #include <media/v4l2-common.h> +#include <media/v4l2-ioctl.h> #include <media/v4l2-chip-ident.h> #include <linux/device.h> #include <linux/wait.h> @@ -2164,7 +2165,7 @@ static int cafe_pci_probe(struct pci_dev *pdev, cam->v4ldev = cafe_v4l_template; cam->v4ldev.debug = 0; // cam->v4ldev.debug = V4L2_DEBUG_IOCTL_ARG; - cam->v4ldev.dev = &pdev->dev; + cam->v4ldev.parent = &pdev->dev; ret = video_register_device(&cam->v4ldev, VFL_TYPE_GRABBER, -1); if (ret) goto out_smbus; |