diff -upr v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c ../b/v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c
--- v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c	2008-06-29 18:15:40.000000000 +0800
+++ ../b/v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c	2008-06-29 18:17:03.000000000 +0800
@@ -4239,17 +4239,13 @@ struct saa7134_board saa7134_boards[] = 
 			 .amux = TV,
 			 .tv   = 1,
 		 }, {
-			 .name = name_comp1,
-			 .vmux = 3,
-			 .amux = LINE2,
+			 .name = name_comp,
+			 .vmux = 0,
+			 .amux = LINE1,
 		 }, {
 			 .name = name_svideo,
 			 .vmux = 8,
 			 .amux = LINE1,
-		}, {
-			.name = name_comp,
-			.vmux = 0,
-			.amux = LINE1,
 		 } },
 		 .radio = {
 			 .name = name_radio,