Hi Umang, Thank you for the patch. On Thu, Jan 19, 2023 at 05:25:02PM +0530, Umang Jain wrote: > Drop the include directive they can break the build one only wants to > build a subdirectory. Replace with "../" for the includes, in the > interface/ files instead. > > Suggested-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > Signed-off-by: Umang Jain <umang.jain@xxxxxxxxxxxxxxxx> > --- > drivers/staging/vc04_services/Makefile | 2 -- > drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h | 2 +- > .../staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h | 3 ++- > 3 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile > index 1fd191e2e2a5..44794bdf6173 100644 > --- a/drivers/staging/vc04_services/Makefile > +++ b/drivers/staging/vc04_services/Makefile > @@ -15,5 +15,3 @@ obj-$(CONFIG_SND_BCM2835) += bcm2835-audio/ > obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-camera/ > obj-$(CONFIG_BCM2835_VCHIQ_MMAL) += vchiq-mmal/ > > -ccflags-y += -I $(srctree)/$(src)/include > - Same comment as for 2/6. Personally, I think I'd prefer dropping 2/6, 4/6 and 5/6 until it's time to move vchiq out of staging, at which point the ccflags-y will just be dropped, without requiring other changes. > diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h > index 3c198eb1c77a..ec1a3caefaea 100644 > --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h > +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h > @@ -10,8 +10,8 @@ > #include <linux/kref.h> > #include <linux/rcupdate.h> > #include <linux/wait.h> > -#include <linux/raspberrypi/vchiq.h> > > +#include "../../include/linux/raspberrypi/vchiq.h" > #include "vchiq_cfg.h" > > /* Do this so that we can test-build the code on non-rpi systems */ > diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h > index 96f50beace44..17550831f86c 100644 > --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h > +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h > @@ -5,7 +5,8 @@ > #define VCHIQ_IOCTLS_H > > #include <linux/ioctl.h> > -#include <linux/raspberrypi/vchiq.h> > + > +#include "../../include/linux/raspberrypi/vchiq.h" > > #define VCHIQ_IOC_MAGIC 0xc4 > #define VCHIQ_INVALID_HANDLE (~0) -- Regards, Laurent Pinchart
