diff options
author | 2017-08-28 13:00:44 -0600 | |
---|---|---|
committer | 2017-08-28 13:00:44 -0600 | |
commit | cd996fb47c360320cf25ac9503c16de085ea9cfc (patch) | |
tree | 38a4730b2c031afe7daf632064f9687f1e09194e /drivers/staging/media/atomisp/i2c/imx/imx.h | |
parent | block: fix warning when I/O elevator is changed as request_queue is being removed (diff) | |
parent | Linux 4.13-rc7 (diff) | |
download | linux-dev-cd996fb47c360320cf25ac9503c16de085ea9cfc.tar.xz linux-dev-cd996fb47c360320cf25ac9503c16de085ea9cfc.zip |
Merge tag 'v4.13-rc7' into for-4.14/block-postmerge
Linux 4.13-rc7
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/staging/media/atomisp/i2c/imx/imx.h')
-rw-r--r-- | drivers/staging/media/atomisp/i2c/imx/imx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/atomisp/i2c/imx/imx.h b/drivers/staging/media/atomisp/i2c/imx/imx.h index 36b3f3a5a41f..41b4133ca995 100644 --- a/drivers/staging/media/atomisp/i2c/imx/imx.h +++ b/drivers/staging/media/atomisp/i2c/imx/imx.h @@ -480,7 +480,7 @@ struct imx_device { struct imx_vcm *vcm_driver; struct imx_otp *otp_driver; const struct imx_resolution *curr_res_table; - int entries_curr_table; + unsigned long entries_curr_table; const struct firmware *fw; struct imx_reg_addr *reg_addr; const struct imx_reg *param_hold; |