diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-19 09:08:53 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 14:53:35 -0500 |
| commit | a42aa191cc2b7573bdcf53023c4e9d5cfe91363e (patch) | |
| tree | dba085380134ba5abf850d37a20050b606528bd8 /drivers/media/video/em28xx/em28xx-cards.c | |
| parent | 5c2231c84304563fd5d28e8bbb72e09e882a8e32 (diff) | |
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 <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 4 |
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 ea7e6cb06e6..d25d95c7d1f 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[] = { | |||
| 945 | }, { | 945 | }, { |
| 946 | .type = EM28XX_VMUX_COMPOSITE1, | 946 | .type = EM28XX_VMUX_COMPOSITE1, |
| 947 | .vmux = TVP5150_COMPOSITE1, | 947 | .vmux = TVP5150_COMPOSITE1, |
| 948 | .amux = EM28XX_AMUX_AC97_LINE_IN, | 948 | .amux = EM28XX_AMUX_LINE_IN, |
| 949 | }, { /* S-video has not been tested yet */ | 949 | }, { /* S-video has not been tested yet */ |
| 950 | .type = EM28XX_VMUX_SVIDEO, | 950 | .type = EM28XX_VMUX_SVIDEO, |
| 951 | .vmux = TVP5150_SVIDEO, | 951 | .vmux = TVP5150_SVIDEO, |
| 952 | .amux = EM28XX_AMUX_AC97_LINE_IN, | 952 | .amux = EM28XX_AMUX_LINE_IN, |
| 953 | } }, | 953 | } }, |
| 954 | }, | 954 | }, |
| 955 | [EM2881_BOARD_DNT_DA2_HYBRID] = { | 955 | [EM2881_BOARD_DNT_DA2_HYBRID] = { |