From 7e782cc1a75d595e5ca247c990c1e530a7892265 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 20 Nov 2008 13:43:05 -0300
Subject: [PATCH] --- yaml --- r: 124223 b: refs/heads/master c:
 30e4ac7c033f6a2c2e3060875a2f08d7909636a1 h: refs/heads/master i:   124221:
 3dc97d765c5288f6ef15e39d7f8d4abe21993d69   124219:
 f56a5b8434ce43aad7deea0e18a9ba81e6280997   124215:
 084f0da37a66b89335f4069ad21c6dfecd0e9ba7   124207:
 78d6b0a1f4bd6190baaf9f424e14f085e89cf29d   124191:
 7855f95d58e677a6dd22e8ddb8324ea18ecbb4d2   124159:
 f3ab620f97dcb258ab299c2d96a11f96ea0fe268 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/em28xx/em28xx-cards.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a211200df985..52513b2909cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e879b8ebb000298f8124fc8fae570afc9eb37cbb
+refs/heads/master: 30e4ac7c033f6a2c2e3060875a2f08d7909636a1
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
index 1b4488a38c10..68bbfdbbca14 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-cards.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -847,7 +847,9 @@ struct em28xx_board em28xx_boards[] = {
 		.input          = { {
 			.type     = EM28XX_VMUX_TELEVISION,
 			.vmux     = SAA7115_COMPOSITE2,
-			.amux     = EM28XX_AMUX_LINE_IN,
+			.amux     = EM28XX_AMUX_VIDEO,
+			.aout     = EM28XX_AOUT_MONO | 	/* I2S */
+				    EM28XX_AOUT_MASTER,	/* Line out pin */
 		}, {
 			.type     = EM28XX_VMUX_COMPOSITE1,
 			.vmux     = SAA7115_COMPOSITE0,