From: Mauro Carvalho Chehab Date: Wed, 19 Nov 2008 14:08:53 +0000 (-0300) Subject: V4L/DVB (9649): em28xx: remove two amux entries used only on one card X-Git-Tag: v2.6.29-rc1~556^2~385 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a42aa191cc2b7573bdcf53023c4e9d5cfe91363e;p=karo-tx-linux.git V4L/DVB (9649): em28xx: remove two amux entries used only on one card This patch parepares for an audio refactor patch that auto-detects ac97 chips. Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index ea7e6cb06e6b..d25d95c7d1ff 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c @@ -945,11 +945,11 @@ struct em28xx_board em28xx_boards[] = { }, { .type = EM28XX_VMUX_COMPOSITE1, .vmux = TVP5150_COMPOSITE1, - .amux = EM28XX_AMUX_AC97_LINE_IN, + .amux = EM28XX_AMUX_LINE_IN, }, { /* S-video has not been tested yet */ .type = EM28XX_VMUX_SVIDEO, .vmux = TVP5150_SVIDEO, - .amux = EM28XX_AMUX_AC97_LINE_IN, + .amux = EM28XX_AMUX_LINE_IN, } }, }, [EM2881_BOARD_DNT_DA2_HYBRID] = {