diff --git a/[refs] b/[refs]
index 1cff0b0bd0a2..e79bb6f8b13d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bea3514dd4a44490b53cc52498b2967e48056dd
+refs/heads/master: 4efc9abfde232a74ed1a4c2c1f797bdacf7bda53
diff --git a/trunk/drivers/media/video/ivtv/ivtv-streams.c b/trunk/drivers/media/video/ivtv/ivtv-streams.c
index 76279ed30da2..f77d764707b2 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-streams.c
+++ b/trunk/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;