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/ivtv | |
| 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/ivtv')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-driver.h | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-streams.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.h b/linux/drivers/media/video/ivtv/ivtv-driver.h index 7bae21e5b..d66ee14b6 100644 --- a/linux/drivers/media/video/ivtv/ivtv-driver.h +++ b/linux/drivers/media/video/ivtv/ivtv-driver.h @@ -61,6 +61,7 @@ #include <linux/dvb/video.h> #include <linux/dvb/audio.h> #include <media/v4l2-common.h> +#include <media/v4l2-ioctl.h> #include <media/tuner.h> #include <media/cx2341x.h> diff --git a/linux/drivers/media/video/ivtv/ivtv-streams.c b/linux/drivers/media/video/ivtv/ivtv-streams.c index f8883b487..b883c4e08 100644 --- a/linux/drivers/media/video/ivtv/ivtv-streams.c +++ b/linux/drivers/media/video/ivtv/ivtv-streams.c @@ -217,7 +217,7 @@ static int ivtv_prep_dev(struct ivtv *itv, int type) itv->num, s->name); s->v4l2dev->minor = minor; - s->v4l2dev->dev = &itv->dev->dev; + s->v4l2dev->parent = &itv->dev->dev; s->v4l2dev->fops = ivtv_stream_info[type].fops; s->v4l2dev->release = video_device_release; s->v4l2dev->tvnorms = V4L2_STD_ALL; |