.tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
                .tda9887_conf   = TDA9887_PRESENT,
-               .mpeg           = CX88_MPEG_BLACKBIRD,
                .input          = {{
                        .type   = CX88_VMUX_COMPOSITE1,
                        .vmux   = 0,
                        .vmux   = 2,
                        .gpio0  = 0x0000cdf3,
                },
+               .mpeg           = CX88_MPEG_BLACKBIRD,
        },
        [CX88_BOARD_KWORLD_VSTREAM_EXPERT_DVD] = {
                 /* Alexander Wold <awold@bigfoot.com> */
                        .gpio0  = 0x070b,
                }},
        },
-       [CX88_BOARD_TE_DTV_250_OEM_SWANN] = {
-              .name           = "Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann OEM",
-              .tuner_type     = TUNER_LG_PAL_NEW_TAPC,
-              .radio_type     = UNSET,
-              .tuner_addr     = ADDR_UNSET,
-              .radio_addr     = ADDR_UNSET,
-              .input          = {{
-                      .type   = CX88_VMUX_TELEVISION,
-                      .vmux   = 0,
-                      .gpio0  = 0x003fffff,
-                      .gpio1  = 0x00e00000,
-                      .gpio2  = 0x003fffff,
-                      .gpio3  = 0x02000000,
-              },{
-                      .type   = CX88_VMUX_COMPOSITE1,
-                      .vmux   = 1,
-                      .gpio0  = 0x003fffff,
-                      .gpio1  = 0x00e00000,
-                      .gpio2  = 0x003fffff,
-                      .gpio3  = 0x02000000,
-               },{
-                      .type   = CX88_VMUX_SVIDEO,
-                      .vmux   = 2,
-                      .gpio0  = 0x003fffff,
-                      .gpio1  = 0x00e00000,
-                      .gpio2  = 0x003fffff,
-                      .gpio3  = 0x02000000,
-              }},
-       },
+       [CX88_BOARD_TE_DTV_250_OEM_SWANN] = {
+               .name           = "Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann OEM",
+               .tuner_type     = TUNER_LG_PAL_NEW_TAPC,
+               .radio_type     = UNSET,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .input          = {{
+                       .type   = CX88_VMUX_TELEVISION,
+                       .vmux   = 0,
+                       .gpio0  = 0x003fffff,
+                       .gpio1  = 0x00e00000,
+                       .gpio2  = 0x003fffff,
+                       .gpio3  = 0x02000000,
+               },{
+                       .type   = CX88_VMUX_COMPOSITE1,
+                       .vmux   = 1,
+                       .gpio0  = 0x003fffff,
+                       .gpio1  = 0x00e00000,
+                       .gpio2  = 0x003fffff,
+                       .gpio3  = 0x02000000,
+               },{
+                       .type   = CX88_VMUX_SVIDEO,
+                       .vmux   = 2,
+                       .gpio0  = 0x003fffff,
+                       .gpio1  = 0x00e00000,
+                       .gpio2  = 0x003fffff,
+                       .gpio3  = 0x02000000,
+               }},
+       },
        [CX88_BOARD_HAUPPAUGE_HVR1300] = {
                .name           = "Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encoder",
                .tuner_type     = TUNER_PHILIPS_FMD1216ME_MK3,