aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 14:00:23 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 17:07:54 -0400
commitfe43ef894c282dbfa963872eef577bab46a178fb (patch)
treeca4e141666ffbacc8aa50b1fd76f43026cce7490 /drivers/media
parent10ac6603613d46a43a4544fbbe9581e50879bd45 (diff)
V4L/DVB (8542): em28xx: AMD ATI TV Wonder HD 600 entry at cards struct is duplicated
Thanks to "Devin Heitmueller" <devin.heitmueller@gmail.com> for pointing this issue. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 2064f7203376..6b241cc6c413 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -675,29 +675,6 @@ struct em28xx_board em28xx_boards[] = {
675 .amux = 1, 675 .amux = 1,
676 } }, 676 } },
677 }, 677 },
678 [EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600] = {
679 .name = "AMD ATI TV Wonder HD 600",
680 .vchannels = 3,
681 .tda9887_conf = TDA9887_PRESENT,
682 .tuner_type = TUNER_XC2028,
683 .mts_firmware = 1,
684 .has_12mhz_i2s = 1,
685 .has_dvb = 1,
686 .decoder = EM28XX_TVP5150,
687 .input = { {
688 .type = EM28XX_VMUX_TELEVISION,
689 .vmux = TVP5150_COMPOSITE0,
690 .amux = 0,
691 }, {
692 .type = EM28XX_VMUX_COMPOSITE1,
693 .vmux = TVP5150_COMPOSITE1,
694 .amux = 1,
695 }, {
696 .type = EM28XX_VMUX_SVIDEO,
697 .vmux = TVP5150_SVIDEO,
698 .amux = 1,
699 } },
700 },
701 [EM2880_BOARD_TERRATEC_HYBRID_XS] = { 678 [EM2880_BOARD_TERRATEC_HYBRID_XS] = {
702 .name = "Terratec Hybrid XS", 679 .name = "Terratec Hybrid XS",
703 .vchannels = 3, 680 .vchannels = 3,