---

yaml --- r: 357348 b: refs/heads/master c: 5e8d02b h: refs/heads/master v: v3
git-mirror · Jan 6, 2013 · 91948bd · 91948bd
1 parent c21e25d
commit 91948bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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,