commit f89076c5f13dc2fafd6c4a411111f1be7aab0098
author Gavin Hurlbut <gjhurlbu@gmail.com> Mon Sep 27 23:50:43 2010 -0300
committer Mauro Carvalho Chehab <mchehab@redhat.com> Thu Oct 21 07:55:28 2010 -0200
tree 7da99ed739915dc6e390b645c453f6284f588dc8
parent c7e242baf73a284eff92444fb58af11439e3a22c

[media] Change the second input names to include " 2" to distinguish them

Signed-off-by: Gavin Hurlbut <gjhurlbu@gmail.com>
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

drivers/media/video/saa7164/saa7164-encoder.c

diff --git a/drivers/media/video/saa7164/saa7164-encoder.c b/drivers/media/video/saa7164/saa7164-encoder.c
index 2e7d285..edd888e 100644
--- a/drivers/media/video/saa7164/saa7164-encoder.c
+++ b/drivers/media/video/saa7164/saa7164-encoder.c
@@ -239,7 +239,7 @@
 	int n;
 
 	char *inputs[] = { "tuner", "composite", "svideo", "aux",
-		"composite", "svideo", "aux" };
+		"composite 2", "svideo 2", "aux 2" };
 
 	if (i->index >= 7)
 		return -EINVAL;

drivers/media/video/saa7164/saa7164-vbi.c

diff --git a/drivers/media/video/saa7164/saa7164-vbi.c b/drivers/media/video/saa7164/saa7164-vbi.c
index 651f404..c9b124c 100644
--- a/drivers/media/video/saa7164/saa7164-vbi.c
+++ b/drivers/media/video/saa7164/saa7164-vbi.c
@@ -213,7 +213,7 @@
 	int n;
 
 	char *inputs[] = { "tuner", "composite", "svideo", "aux",
-		"composite", "svideo", "aux" };
+		"composite 2", "svideo 2", "aux 2" };
 
 	if (i->index >= 7)
 		return -EINVAL;