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

Commit 3df2ab39 authored by Pavan Kumar Chilamkurthi's avatar Pavan Kumar Chilamkurthi Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Camera: Correct makefiles for correct header inclusion" into camera-kernel.lnx.1.0

parents f2a0cc11 5b016ad2

drivers/Makefile

+13 −13
Original line number Diff line number Diff line 
obj-y += cam_req_mgr/

obj-y += cam_utils/

obj-y += cam_core/

obj-y += cam_sync/

obj-y += cam_smmu/

obj-y += cam_cpas/

obj-y += cam_cdm/

obj-y += cam_isp/

obj-y += cam_sensor_module/

obj-y += cam_icp/

obj-y += cam_jpeg/

obj-y += cam_fd/

obj-y += cam_lrme/
 
obj-$(CONFIG_SPECTRA_CAMERA) += cam_req_mgr/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_utils/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_core/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_sync/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_smmu/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_cpas/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_cdm/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_isp/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_sensor_module/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_icp/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_jpeg/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_fd/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_lrme/

drivers/cam_cdm/Makefile

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media

ccflags-y += -I$(srctree)/techpack/camera/include/uapi

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr



obj-$(CONFIG_SPECTRA_CAMERA) += cam_cdm_util.o cam_cdm_intf.o cam_cdm_soc.o\

obj-$(CONFIG_SPECTRA_CAMERA) += cam_cdm_soc.o cam_cdm_util.o cam_cdm_intf.o\

				cam_cdm_core_common.o cam_cdm_virtual_core.o \

				cam_cdm_hw_core.o

drivers/cam_cdm/cam_cdm_hw_core.c

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

#include <linux/kernel.h>



#include <cam_req_mgr.h>

#include <media/cam_req_mgr.h>

#include "cam_soc_util.h"

#include "cam_smmu_api.h"

#include "cam_cdm_intf_api.h"

drivers/cam_core/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media

ccflags-y += -I$(srctree)/techpack/camera/include/uapi

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/

ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sync

drivers/cam_core/cam_context_utils.c

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
#include <linux/videodev2.h>

#include <linux/slab.h>

#include <linux/uaccess.h>

#include <cam_sync.h>

#include <cam_defs.h>

#include <media/cam_sync.h>

#include <media/cam_defs.h>



#include "cam_context.h"

#include "cam_context_utils.h"