Commit 5395fb3b authored by Umang Jain's avatar Umang Jain Committed by Greg Kroah-Hartman
Browse files

staging: vc04_services: bcm2835-camera: Drop include Makefile directive 



Drop the include directive. They can break the build, when one only
wants to build a subdirectory. Replace with "../" for the includes,
in the bcm2835-camera files instead.

Suggested-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarUmang Jain <umang.jain@ideasonboard.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://lore.kernel.org/r/20230120201104.606876-4-umang.jain@ideasonboard.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 29d49a76

drivers/staging/vc04_services/bcm2835-camera/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -4,7 +4,3 @@ bcm2835-v4l2-$(CONFIG_VIDEO_BCM2835) := \ 
	controls.o



obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-v4l2.o
 


ccflags-y += \

	-I $(srctree)/$(src)/.. \

	-I $(srctree)/$(src)/../vchiq-mmal/

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c

+5 −5
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ 
#include <linux/delay.h>

#include <linux/platform_device.h>



#include "mmal-common.h"

#include "mmal-encodings.h"

#include "mmal-vchiq.h"

#include "mmal-msg.h"

#include "mmal-parameters.h"

#include "../vchiq-mmal/mmal-common.h"

#include "../vchiq-mmal/mmal-encodings.h"

#include "../vchiq-mmal/mmal-vchiq.h"

#include "../vchiq-mmal/mmal-msg.h"

#include "../vchiq-mmal/mmal-parameters.h"

#include "bcm2835-camera.h"



#define MIN_WIDTH 32

drivers/staging/vc04_services/bcm2835-camera/controls.c

+3 −3
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ 
#include <media/v4l2-event.h>

#include <media/v4l2-common.h>



#include "mmal-common.h"

#include "mmal-vchiq.h"

#include "mmal-parameters.h"

#include "../vchiq-mmal/mmal-common.h"

#include "../vchiq-mmal/mmal-vchiq.h"

#include "../vchiq-mmal/mmal-parameters.h"

#include "bcm2835-camera.h"



/* The supported V4L2_CID_AUTO_EXPOSURE_BIAS values are from -4.0 to +4.0.