lkml.org 
[lkml]   [2023]   [Jan]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 5/6] vc04_services: interface: Drop include Makefile directive
    Date
    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@linuxfoundation.org>
    Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
    ---
    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
    -
    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 ec3505424718..12da398c6115 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)
    --
    2.39.0
    \
     
     \ /
      Last update: 2023-03-26 23:46    [W:2.285 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site