]> err.no Git - linux-2.6/commitdiff
V4L/DVB (8542): em28xx: AMD ATI TV Wonder HD 600 entry at cards struct is duplicated
authorMauro Carvalho Chehab <mchehab@infradead.org>
Sun, 27 Jul 2008 18:00:23 +0000 (15:00 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Sun, 27 Jul 2008 21:07:54 +0000 (18:07 -0300)
Thanks to "Devin Heitmueller" <devin.heitmueller@gmail.com> for pointing this
issue.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/em28xx/em28xx-cards.c

index 2064f7203376a345a752463a1408e27b32cd6c11..6b241cc6c413c6b8652abfb1921d49eb1e4e4569 100644 (file)
@@ -675,29 +675,6 @@ struct em28xx_board em28xx_boards[] = {
                        .amux     = 1,
                } },
        },
-       [EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600] = {
-               .name           = "AMD ATI TV Wonder HD 600",
-               .vchannels      = 3,
-               .tda9887_conf   = TDA9887_PRESENT,
-               .tuner_type     = TUNER_XC2028,
-               .mts_firmware   = 1,
-               .has_12mhz_i2s  = 1,
-               .has_dvb        = 1,
-               .decoder        = EM28XX_TVP5150,
-               .input          = { {
-                       .type     = EM28XX_VMUX_TELEVISION,
-                       .vmux     = TVP5150_COMPOSITE0,
-                       .amux     = 0,
-               }, {
-                       .type     = EM28XX_VMUX_COMPOSITE1,
-                       .vmux     = TVP5150_COMPOSITE1,
-                       .amux     = 1,
-               }, {
-                       .type     = EM28XX_VMUX_SVIDEO,
-                       .vmux     = TVP5150_SVIDEO,
-                       .amux     = 1,
-               } },
-       },
        [EM2880_BOARD_TERRATEC_HYBRID_XS] = {
                .name         = "Terratec Hybrid XS",
                .vchannels    = 3,