diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2019-02-19 02:38:22 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-02-19 08:12:46 -0500 |
| commit | 2758d9a77fb41134b9014549d165c20ba9d084c9 (patch) | |
| tree | 75564ba2336197bfe4f7151edf6d4a205f9b51e2 /tools/perf/scripts/python | |
| parent | b3c786566d8f3f69b9f4144c2707db74158caf9a (diff) | |
media: imx7-media-csi.c: fix merge breakage
Commit 5964cbd86922 ("imx: Set capture compose rectangle in
capture_device_set_format") broke the compilation of commit
05f634040c0d ("staging/imx7: add imx7 CSI subdev driver").
These patches came in through different pull requests and
nobody noticed that the first changed functions that the
second relied upon.
Update imx7-media-csi.c accordingly.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Rui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions