aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7164
diff options
context:
space:
mode:
authorGavin Hurlbut <gjhurlbu@gmail.com>2010-09-27 22:50:43 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 05:55:28 -0400
commitf89076c5f13dc2fafd6c4a411111f1be7aab0098 (patch)
tree7da99ed739915dc6e390b645c453f6284f588dc8 /drivers/media/video/saa7164
parentc7e242baf73a284eff92444fb58af11439e3a22c (diff)
[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/video/saa7164')
-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,
239 int n; 239 int n;
240 240
241 char *inputs[] = { "tuner", "composite", "svideo", "aux", 241 char *inputs[] = { "tuner", "composite", "svideo", "aux",
242 "composite", "svideo", "aux" }; 242 "composite 2", "svideo 2", "aux 2" };
243 243
244 if (i->index >= 7) 244 if (i->index >= 7)
245 return -EINVAL; 245 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,
213 int n; 213 int n;
214 214
215 char *inputs[] = { "tuner", "composite", "svideo", "aux", 215 char *inputs[] = { "tuner", "composite", "svideo", "aux",
216 "composite", "svideo", "aux" }; 216 "composite 2", "svideo 2", "aux 2" };
217 217
218 if (i->index >= 7) 218 if (i->index >= 7)
219 return -EINVAL; 219 return -EINVAL;