diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-04-30 21:09:07 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-04-30 21:09:06 -0700 |
| commit | b09928fabb7397ceea26ba74c4d36cda235dab30 (patch) | |
| tree | 17d474c256ad26b9a8952b279feaa02ec32442a2 /include | |
| parent | 1a61dab6604991467e969aea6e8a72333b5c889c (diff) | |
| parent | fd4aade7566d76f67fddfe59134bcc8f3bdc4f01 (diff) | |
Merge "msm: camera: Change data type of data rate"
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/media/msm_camera.h | 5 | ||||
| -rw-r--r-- | include/uapi/media/msm_camsensor_sdk.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/uapi/media/msm_camera.h b/include/uapi/media/msm_camera.h index 8fb69aeef9b4..fd0937ffb1e5 100644 --- a/include/uapi/media/msm_camera.h +++ b/include/uapi/media/msm_camera.h @@ -1,4 +1,5 @@ -/* Copyright (c) 2009-2012, 2014-2016 The Linux Foundation. All rights reserved. +/* Copyright (c) 2009-2012, 2014-2016, 2018 The Linux Foundation. + * All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1386,7 +1387,7 @@ struct msm_camera_csiphy_params { uint16_t lane_mask; uint8_t combo_mode; uint8_t csid_core; - unsigned long data_rate; + uint64_t data_rate; }; struct msm_camera_csi2_params { diff --git a/include/uapi/media/msm_camsensor_sdk.h b/include/uapi/media/msm_camsensor_sdk.h index 4d348c7bc373..ac454ca9a7fc 100644 --- a/include/uapi/media/msm_camsensor_sdk.h +++ b/include/uapi/media/msm_camsensor_sdk.h @@ -367,7 +367,7 @@ struct msm_camera_csiphy_params { unsigned char csid_core; unsigned int csiphy_clk; unsigned char csi_3phase; - unsigned long data_rate; + uint64_t data_rate; }; struct msm_camera_i2c_seq_reg_array { |