Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd

Conflicts:
	drivers/mtd/nand/nand_base.c

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/media/usb/stk1160/stk1160-v4l.c b/drivers/media/usb/stk1160/stk1160-v4l.c
index fe6e857969ca..6694f9e2ca57 100644
--- a/drivers/media/usb/stk1160/stk1160-v4l.c
+++ b/drivers/media/usb/stk1160/stk1160-v4l.c
@@ -419,7 +419,12 @@ static int vidioc_enum_input(struct file *file, void *priv,
         if (i->index > STK1160_MAX_INPUT)
                 return -EINVAL;
 
-        sprintf(i->name, "Composite%d", i->index);
+        /* S-Video special handling */
+        if (i->index == STK1160_SVIDEO_INPUT)
+                sprintf(i->name, "S-Video");
+        else
+                sprintf(i->name, "Composite%d", i->index);
+
         i->type = V4L2_INPUT_TYPE_CAMERA;
         i->std = dev->vdev.tvnorms;
         return 0;