diff --git a/[refs] b/[refs]
index 63ac0a68bf61..0866c72350ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b730a81c51adc8e87ae3b055fc211af7d5472df2
+refs/heads/master: 4aa504a89a140f482ddabb45460e0005bf3e522a
diff --git a/trunk/drivers/media/video/saa7134/saa7134-cards.c b/trunk/drivers/media/video/saa7134/saa7134-cards.c
index 4f3dad9ae6d6..c6eb1e37a46e 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-cards.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-cards.c
@@ -334,7 +334,7 @@ struct saa7134_board saa7134_boards[] = {
 			.tv   = 1,
 		},{
 			.name = name_comp1,
-			.vmux = 2,
+			.vmux = 0,
 			.amux = LINE1,
 		},{
 			.name = name_comp2,