Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[cascardo/linux.git] / drivers / media / i2c / ths8200.c

diff --git a/drivers/media/i2c/ths8200.c b/drivers/media/i2c/ths8200.c
index 8cf20f7..04139ee 100644 (file)
--- a/drivers/media/i2c/ths8200.c
+++ b/drivers/media/i2c/ths8200.c
@@ -47,18 +47,10 @@ struct ths8200_state {
 
 static const struct v4l2_dv_timings_cap ths8200_timings_cap = {
        .type = V4L2_DV_BT_656_1120,
-       /* Allow gcc 4.5.4 to build this */
-       .reserved = { },
-       {
-               .bt = {
-                       .max_width = 1920,
-                       .max_height = 1080,
-                       .min_pixelclock = 25000000,
-                       .max_pixelclock = 148500000,
-                       .standards = V4L2_DV_BT_STD_CEA861,
-                       .capabilities = V4L2_DV_BT_CAP_PROGRESSIVE,
-               },
-       },
+       /* keep this initialization for compatibility with GCC < 4.4.6 */
+       .reserved = { 0 },
+       V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1080, 25000000, 148500000,
+               V4L2_DV_BT_STD_CEA861, V4L2_DV_BT_CAP_PROGRESSIVE)
 };
 
 static inline struct ths8200_state *to_state(struct v4l2_subdev *sd)