diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-12-23 19:57:17 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-12-23 19:57:17 +0100 |
| commit | ac2c9fd519acfcea10f4b1b17b69e9f3d8f49555 (patch) | |
| tree | 3aa28180723e897e8ae6704940ed70d0679ed680 /linux/drivers/media/video/ivtv/ivtv-streams.c | |
| parent | e3ed9d5ccedc1a7a60c7cf106fbfb795448b32ea (diff) | |
| parent | d8fa5b2669acb99dcbc246d93bef9f2028c1aff0 (diff) | |
| download | mediapointer-dvb-s2-ac2c9fd519acfcea10f4b1b17b69e9f3d8f49555.tar.gz mediapointer-dvb-s2-ac2c9fd519acfcea10f4b1b17b69e9f3d8f49555.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-streams.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-streams.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-streams.c b/linux/drivers/media/video/ivtv/ivtv-streams.c index 76279ed30..f77d76470 100644 --- a/linux/drivers/media/video/ivtv/ivtv-streams.c +++ b/linux/drivers/media/video/ivtv/ivtv-streams.c @@ -209,7 +209,7 @@ static int ivtv_prep_dev(struct ivtv *itv, int type) itv->device.name, s->name); s->v4l2dev->num = num; - s->v4l2dev->parent = &itv->dev->dev; + s->v4l2dev->v4l2_dev = &itv->device; s->v4l2dev->fops = ivtv_stream_info[type].fops; s->v4l2dev->release = video_device_release; s->v4l2dev->tvnorms = V4L2_STD_ALL; |