From 521912ac63f7258075316646c662c5172a983899 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Mon, 30 Jun 2008 20:02:47 -0300
Subject: [PATCH] --- yaml --- r: 103903 b: refs/heads/master c:
 dc5e42fb20229487ef11fd6fa0cdb7b7d42170f6 h: refs/heads/master i:   103901:
 393c81691c27f895a0deea04778157cffa242360   103899:
 ba95574190efdd942e22bd105c93831c0c819c24   103895:
 914dec98ea01b8aa63ca4c42e444be2e9369f96d   103887:
 ea76800c904c20b22c55de804c23ad8a2936d37d   103871:
 4421a8becd1b74336485be588a9bc84c579abcce v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/video/ivtv/ivtv-streams.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3f2009c7ac1d..1cce31162206 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8b934de12989d1704e7df7ebb408a6021f08442
+refs/heads/master: dc5e42fb20229487ef11fd6fa0cdb7b7d42170f6
diff --git a/trunk/drivers/media/video/ivtv/ivtv-streams.c b/trunk/drivers/media/video/ivtv/ivtv-streams.c
index 8e3addd45090..f8883b487f4a 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-streams.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-streams.c
@@ -213,8 +213,8 @@ static int ivtv_prep_dev(struct ivtv *itv, int type)
 	if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) {
 		s->v4l2dev->type |= VID_TYPE_MPEG_DECODER;
 	}
-	snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "ivtv%d",
-			itv->num);
+	snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "ivtv%d %s",
+			itv->num, s->name);
 
 	s->v4l2dev->minor = minor;
 	s->v4l2dev->dev = &itv->dev->dev;