mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-06 10:00:17 +00:00
staging: vc04_services: bcm2835-isp: 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-isp instead.
The fix is equivalent to the four patches between 29d49a76c5
("staging: vc04_services: bcm2835-audio: Drop include Makefile
directive")...2529ca211402 ("staging: vc04_services: interface: Drop
include Makefile directive")
Fixes: c8f89c9551c1 ("staging: vc04_services: ISP: Add a more complex ISP processing component")
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
committed by
Dom Cobley
parent
d4e538e0a9
commit
22e3fd68d3
@@ -4,5 +4,4 @@ bcm2835-isp-objs := bcm2835-v4l2-isp.o
|
|||||||
obj-$(CONFIG_VIDEO_ISP_BCM2835) += bcm2835-isp.o
|
obj-$(CONFIG_VIDEO_ISP_BCM2835) += bcm2835-isp.o
|
||||||
|
|
||||||
ccflags-y += \
|
ccflags-y += \
|
||||||
-I$(srctree)/drivers/staging/vc04_services \
|
|
||||||
-D__VCCOREVER__=0x04000000
|
-D__VCCOREVER__=0x04000000
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
#define BCM2835_ISP_FMTS
|
#define BCM2835_ISP_FMTS
|
||||||
|
|
||||||
#include <linux/videodev2.h>
|
#include <linux/videodev2.h>
|
||||||
#include "vchiq-mmal/mmal-encodings.h"
|
#include "../vchiq-mmal/mmal-encodings.h"
|
||||||
|
|
||||||
struct bcm2835_isp_fmt {
|
struct bcm2835_isp_fmt {
|
||||||
u32 fourcc;
|
u32 fourcc;
|
||||||
|
|||||||
@@ -17,11 +17,11 @@
|
|||||||
#include <media/v4l2-ioctl.h>
|
#include <media/v4l2-ioctl.h>
|
||||||
#include <media/videobuf2-dma-contig.h>
|
#include <media/videobuf2-dma-contig.h>
|
||||||
|
|
||||||
#include "vchiq-mmal/mmal-msg.h"
|
#include "../vchiq-mmal/mmal-msg.h"
|
||||||
#include "vchiq-mmal/mmal-parameters.h"
|
#include "../vchiq-mmal/mmal-parameters.h"
|
||||||
#include "vchiq-mmal/mmal-vchiq.h"
|
#include "../vchiq-mmal/mmal-vchiq.h"
|
||||||
|
|
||||||
#include "vc-sm-cma/vc_sm_knl.h"
|
#include "../vc-sm-cma/vc_sm_knl.h"
|
||||||
|
|
||||||
#include "bcm2835-isp-ctrls.h"
|
#include "bcm2835-isp-ctrls.h"
|
||||||
#include "bcm2835-isp-fmts.h"
|
#include "bcm2835-isp-fmts.h"
|
||||||
|
|||||||
Reference in New Issue
Block a user