diff --git a/[refs] b/[refs] index c941060a65c2..792bda855b93 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29adc2c06fd7aa0a26135d8c96afd1cef9e6700b +refs/heads/master: dda7ae789f1d9b0c2528f7abc37f4316f8fa1e0f diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-core.h b/trunk/drivers/media/video/s5p-fimc/fimc-core.h index e3a7c6a0dce2..3e1078516560 100644 --- a/trunk/drivers/media/video/s5p-fimc/fimc-core.h +++ b/trunk/drivers/media/video/s5p-fimc/fimc-core.h @@ -222,10 +222,10 @@ struct fimc_effect { * @real_height: source pixel (height - offset) */ struct fimc_scaler { - int scaleup_h:1; - int scaleup_v:1; - int copy_mode:1; - int enabled:1; + unsigned int scaleup_h:1; + unsigned int scaleup_v:1; + unsigned int copy_mode:1; + unsigned int enabled:1; u32 hfactor; u32 vfactor; u32 pre_hratio;