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/uvc | |
| 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/uvc')
| -rw-r--r-- | linux/drivers/media/video/uvc/uvc_driver.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/uvc/uvc_v4l2.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/uvc/uvc_driver.c b/linux/drivers/media/video/uvc/uvc_driver.c index f2b2983fe..79d6821c4 100644 --- a/linux/drivers/media/video/uvc/uvc_driver.c +++ b/linux/drivers/media/video/uvc/uvc_driver.c @@ -1458,7 +1458,7 @@ static int uvc_register_video(struct uvc_device *dev) * unregistered before the reference is released, so we don't need to * get another one. */ - vdev->dev = &dev->intf->dev; + vdev->parent = &dev->intf->dev; vdev->type = 0; vdev->type2 = 0; vdev->minor = -1; diff --git a/linux/drivers/media/video/uvc/uvc_v4l2.c b/linux/drivers/media/video/uvc/uvc_v4l2.c index b5a11eb8f..d7bd71be4 100644 --- a/linux/drivers/media/video/uvc/uvc_v4l2.c +++ b/linux/drivers/media/video/uvc/uvc_v4l2.c @@ -23,6 +23,7 @@ #include <asm/atomic.h> #include <media/v4l2-common.h> +#include <media/v4l2-ioctl.h> #include "uvcvideo.h" |