diff --git a/[refs] b/[refs] index 9d16d835f841..a0559781324a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a9ce75516982b0a349df55f326bc0cee572ffc1 +refs/heads/master: 906b101886b1b3d9e4d374aa84a67b7dbd349f16 diff --git a/trunk/drivers/media/video/tw9910.c b/trunk/drivers/media/video/tw9910.c index 5b801a6e1eea..76be733eabfd 100644 --- a/trunk/drivers/media/video/tw9910.c +++ b/trunk/drivers/media/video/tw9910.c @@ -233,10 +233,10 @@ struct tw9910_hsync_ctrl { }; struct tw9910_priv { - struct v4l2_subdev subdev; - struct tw9910_video_info *info; - const struct tw9910_scale_ctrl *scale; - u32 revision; + struct v4l2_subdev subdev; + struct tw9910_video_info *info; + const struct tw9910_scale_ctrl *scale; + u32 revision; }; static const struct tw9910_scale_ctrl tw9910_ntsc_scales[] = { diff --git a/trunk/include/media/tw9910.h b/trunk/include/media/tw9910.h index 5e2895a05e6b..90bcf1fa5421 100644 --- a/trunk/include/media/tw9910.h +++ b/trunk/include/media/tw9910.h @@ -30,8 +30,8 @@ enum tw9910_mpout_pin { }; struct tw9910_video_info { - unsigned long buswidth; - enum tw9910_mpout_pin mpout; + unsigned long buswidth; + enum tw9910_mpout_pin mpout; };