aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-10-25 16:51:15 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 05:17:17 -0500
commita3fa904ec79b94f0db7faed010ff94d42f7d1d47 (patch)
tree44e1648ae8c8f56d5e867d71a5b3c68a65ab05e5 /drivers/media
parentb5fff5445a077af897e670e98ea54b9b440f8b63 (diff)
[media] em28xx: Fix audio input for Terratec Grabby
The audio input line was wrong. Fix it. Cc: stable@kernel.org Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 5d79d0eb64ab..8af302b425b3 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1660,11 +1660,11 @@ struct em28xx_board em28xx_boards[] = {
1660 .input = { { 1660 .input = { {
1661 .type = EM28XX_VMUX_COMPOSITE1, 1661 .type = EM28XX_VMUX_COMPOSITE1,
1662 .vmux = SAA7115_COMPOSITE0, 1662 .vmux = SAA7115_COMPOSITE0,
1663 .amux = EM28XX_AMUX_VIDEO2, 1663 .amux = EM28XX_AMUX_LINE_IN,
1664 }, { 1664 }, {
1665 .type = EM28XX_VMUX_SVIDEO, 1665 .type = EM28XX_VMUX_SVIDEO,
1666 .vmux = SAA7115_SVIDEO3, 1666 .vmux = SAA7115_SVIDEO3,
1667 .amux = EM28XX_AMUX_VIDEO2, 1667 .amux = EM28XX_AMUX_LINE_IN,
1668 } }, 1668 } },
1669 }, 1669 },
1670 [EM2860_BOARD_TERRATEC_AV350] = { 1670 [EM2860_BOARD_TERRATEC_AV350] = {