diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-12-16 08:36:09 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-12-16 08:36:09 +0300 |
| commit | ebfb0184ef560897fad35005989e82433419202c (patch) | |
| tree | 226a8195fdae6c79d90d76baa1cbdaf80f794bb0 /include/linux/platform_data | |
| parent | f43d3ec3a889c7f6a196f3b6d6b13345ee46af8a (diff) | |
| parent | 5191d88acc688743eef56f1c598a4e4cddf6c6cd (diff) | |
| download | linux-ebfb0184ef560897fad35005989e82433419202c.tar.xz | |
Merge branch 'synaptics-rmi4' into next
Merge updated Synaptics RMI4 support, including support for SMBus
controllers and flashing firmware.
Diffstat (limited to 'include/linux/platform_data')
| -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 *); |