mirror of
https://github.com/NixOS/mobile-nixos.git
synced 2024-12-18 05:21:47 +03:00
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
|
From a1cb5824f577a4c1dcc52ded3451c36a0adf80bf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Nato66613 <normandija1945@gmail.com>
|
||
|
|
Date: Sat, 3 Mar 2018 15:18:06 +0200
|
||
|
|
Subject: [PATCH] camera_v2: fix standalone compilaton
|
||
|
|
|
||
|
|
---
|
||
|
|
drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h | 4 ++--
|
||
|
|
include/trace/events/msm_cam.h | 2 +-
|
||
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h
|
||
|
|
index 5eedd7926943..02f3e84cf146 100644
|
||
|
|
--- a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h
|
||
|
|
+++ b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h
|
||
|
|
@@ -31,8 +31,8 @@
|
||
|
|
#include <media/msm_cam_sensor.h>
|
||
|
|
#include <media/v4l2-subdev.h>
|
||
|
|
#include <media/v4l2-ioctl.h>
|
||
|
|
-#include "msm_camera_i2c.h"
|
||
|
|
-#include "msm_camera_dt_util.h"
|
||
|
|
+#include "../io/msm_camera_i2c.h"
|
||
|
|
+#include "../io/msm_camera_dt_util.h"
|
||
|
|
#include "msm_sd.h"
|
||
|
|
|
||
|
|
#define DEFINE_MSM_MUTEX(mutexname) \
|
||
|
|
diff --git a/include/trace/events/msm_cam.h b/include/trace/events/msm_cam.h
|
||
|
|
index 9a5dd158b4b8..fa5de094e210 100644
|
||
|
|
--- a/include/trace/events/msm_cam.h
|
||
|
|
+++ b/include/trace/events/msm_cam.h
|
||
|
|
@@ -16,7 +16,7 @@
|
||
|
|
#if !defined(_TRACE_MSM_VFE_H) || defined(TRACE_HEADER_MULTI_READ)
|
||
|
|
#define _TRACE_MSM_VFE_H
|
||
|
|
|
||
|
|
-#include "msm_isp.h"
|
||
|
|
+#include <uapi/media/msm_isp.h>
|
||
|
|
#include <linux/types.h>
|
||
|
|
#include <linux/tracepoint.h>
|
||
|
|
|