Skip to content

Commit 2529ca2

Browse files
Umang Jaingregkh
Umang Jain
authored andcommitted
staging: vc04_services: interface: 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 interface/ files instead. Suggested-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Umang Jain <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 74d5eb7 commit 2529ca2

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

drivers/staging/vc04_services/Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,3 @@ obj-$(CONFIG_SND_BCM2835) += bcm2835-audio/
1515
obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-camera/
1616
obj-$(CONFIG_BCM2835_VCHIQ_MMAL) += vchiq-mmal/
1717

18-
ccflags-y += -I $(srctree)/$(src)/include
19-

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#include <linux/kref.h>
1111
#include <linux/rcupdate.h>
1212
#include <linux/wait.h>
13-
#include <linux/raspberrypi/vchiq.h>
1413

14+
#include "../../include/linux/raspberrypi/vchiq.h"
1515
#include "vchiq_cfg.h"
1616

1717
/* Do this so that we can test-build the code on non-rpi systems */

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
#define VCHIQ_IOCTLS_H
66

77
#include <linux/ioctl.h>
8-
#include <linux/raspberrypi/vchiq.h>
8+
9+
#include "../../include/linux/raspberrypi/vchiq.h"
910

1011
#define VCHIQ_IOC_MAGIC 0xc4
1112
#define VCHIQ_INVALID_HANDLE (~0)

0 commit comments

Comments
 (0)