Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 011d83cb authored by deadman96385's avatar deadman96385
Browse files

Revert "camera_v2: Rename header files to allow camera code coexistence" 

This reverts commit b5b29086.
parent 8bd66650

drivers/media/platform/msm/camera_v2_fortuna/isp/msm_buf_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <media/v4l2-ioctl.h>

#include <media/v4l2-device.h>

#include <media/videobuf2-core.h>

#include <media/msm_camera-ll.h>

#include <media/msm_camera.h>

#include <media/msm_isp.h>



#include <linux/qcom_iommu.h>

drivers/media/platform/msm/camera_v2_fortuna/isp/msm_buf_mgr.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#ifndef _MSM_ISP_BUF_H_

#define _MSM_ISP_BUF_H_



#include <media/msmb_isp-ll.h>

#include <media/msmb_isp.h>

#include <linux/msm_iommu_domains.h>

#include "msm_sd.h"

drivers/media/platform/msm/camera_v2_fortuna/isp/msm_isp.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <linux/delay.h>

#include <linux/avtimer.h>

#include <media/v4l2-subdev.h>

#include <media/msmb_isp-ll.h>

#include <media/msmb_isp.h>

#include <linux/msm-bus.h>

#include <linux/msm-bus-board.h>

#include "msm_buf_mgr.h"

drivers/media/platform/msm/camera_v2_fortuna/isp/msm_isp_util.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#define __MSM_ISP_UTIL_H__



#include "msm_isp.h"

#include <soc/qcom/camera2-ll.h>

#include <soc/qcom/camera2.h>



/* #define CONFIG_MSM_ISP_DBG 1 */

drivers/media/platform/msm/camera_v2_fortuna/ispif/msm_ispif.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/gpio.h>

#include <linux/iopoll.h>

#include <linux/compat.h>

#include <media/msmb_isp-ll.h>

#include <media/msmb_isp.h>



#include "msm_ispif.h"

#include "msm.h"