summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorGavin Hurlbut <gjhurlbu@gmail.com>2010-09-27 23:50:43 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 07:55:28 -0200
commitf89076c5f13dc2fafd6c4a411111f1be7aab0098 (patch)
tree7da99ed739915dc6e390b645c453f6284f588dc8 /drivers/media
parentc7e242baf73a284eff92444fb58af11439e3a22c (diff)
downloadlwn-f89076c5f13dc2fafd6c4a411111f1be7aab0098.tar.gz
lwn-f89076c5f13dc2fafd6c4a411111f1be7aab0098.zip
[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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/saa7164/saa7164-encoder.c2
-rw-r--r--drivers/media/video/saa7164/saa7164-vbi.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/saa7164/saa7164-encoder.c b/drivers/media/video/saa7164/saa7164-encoder.c
index 2e7d2856d39b..edd888ec3c9b 100644
--- a/drivers/media/video/saa7164/saa7164-encoder.c
+++ b/drivers/media/video/saa7164/saa7164-encoder.c
@@ -239,7 +239,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
int n;
char *inputs[] = { "tuner", "composite", "svideo", "aux",
- "composite", "svideo", "aux" };
+ "composite 2", "svideo 2", "aux 2" };
if (i->index >= 7)
return -EINVAL;
diff --git a/drivers/media/video/saa7164/saa7164-vbi.c b/drivers/media/video/saa7164/saa7164-vbi.c
index 651f40409ae0..c9b124cdd57e 100644
--- a/drivers/media/video/saa7164/saa7164-vbi.c
+++ b/drivers/media/video/saa7164/saa7164-vbi.c
@@ -213,7 +213,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
int n;
char *inputs[] = { "tuner", "composite", "svideo", "aux",
- "composite", "svideo", "aux" };
+ "composite 2", "svideo 2", "aux 2" };
if (i->index >= 7)
return -EINVAL;