From 91948bd4dff84257bc1c3ba4e47f4c18c7d971d7 Mon Sep 17 00:00:00 2001 From: Frank Schaefer Date: Sat, 5 Jan 2013 08:44:09 -0300 Subject: [PATCH] --- yaml --- r: 357348 b: refs/heads/master c: 5e8d02bb346d6240b029f1990ddc295d7d59685b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/em28xx/em28xx-cards.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e0d289dd0df9..7b949192de87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c4fe29a32ffa16c1166edacad1edc2dcf0aaa08c +refs/heads/master: 5e8d02bb346d6240b029f1990ddc295d7d59685b diff --git a/trunk/drivers/media/usb/em28xx/em28xx-cards.c b/trunk/drivers/media/usb/em28xx/em28xx-cards.c index 4d849bfa2db3..0a5aa6223adf 100644 --- a/trunk/drivers/media/usb/em28xx/em28xx-cards.c +++ b/trunk/drivers/media/usb/em28xx/em28xx-cards.c @@ -493,7 +493,7 @@ struct em28xx_board em28xx_boards[] = { .input = { { .type = EM28XX_VMUX_TELEVISION, .vmux = SAA7115_COMPOSITE2, - .amux = EM28XX_AMUX_LINE_IN, + .amux = EM28XX_AMUX_VIDEO, }, { .type = EM28XX_VMUX_COMPOSITE1, .vmux = SAA7115_COMPOSITE0,