diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-11-08 03:35:10 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-11-08 03:35:10 +0300 |
| commit | d27625c9d55bb671c1c6b3a7f2c2b50e9175f958 (patch) | |
| tree | 522542eb5e0633ab165f27797caa9f5ca8feef09 /include/linux | |
| parent | c8d2bc9bc39ebea8437fd974fdbc21847bb897a3 (diff) | |
| parent | 1aeb5b615cd10db7324d4e4d167c4916dfeca311 (diff) | |
| download | linux-d27625c9d55bb671c1c6b3a7f2c2b50e9175f958.tar.xz | |
Merge tag 'media/v4.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media into synaptics-rmi4
Sync up with media tree to bring up latest Synaptics and Atmel changes.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/platform_data/media/camera-pxa.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/platform_data/media/camera-pxa.h b/include/linux/platform_data/media/camera-pxa.h index 6709b1cd7c77..ce5d90e1a6e4 100644 --- a/include/linux/platform_data/media/camera-pxa.h +++ b/include/linux/platform_data/media/camera-pxa.h @@ -37,6 +37,8 @@ struct pxacamera_platform_data { unsigned long flags; unsigned long mclk_10khz; + int sensor_i2c_adapter_id; + int sensor_i2c_address; }; extern void pxa_set_camera_info(struct pxacamera_platform_data *); |