From: Umang Jain <umang.jain@ideasonboard.com>
To: linux-staging@lists.linux.dev,
linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Stefan Wahren <stefan.wahren@i2se.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Florian Fainelli <f.fainelli@gmail.com>,
Adrien Thierry <athierry@redhat.com>,
Dan Carpenter <error27@gmail.com>,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
Kieran Bingham <kieran.bingham@ideasonboard.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Paul Elder <paul.elder@ideasonboard.com>,
Umang Jain <umang.jain@ideasonboard.com>
Subject: [PATCH v6 2/6] staging: vc04_services: bcm2835-audio: Drop include Makefile directive
Date: Sat, 21 Jan 2023 01:41:00 +0530 [thread overview]
Message-ID: <20230120201104.606876-3-umang.jain@ideasonboard.com> (raw)
In-Reply-To: <20230120201104.606876-1-umang.jain@ideasonboard.com>
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.h instead.
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
---
drivers/staging/vc04_services/bcm2835-audio/Makefile | 2 --
drivers/staging/vc04_services/bcm2835-audio/bcm2835.h | 3 ++-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/Makefile b/drivers/staging/vc04_services/bcm2835-audio/Makefile
index fc7ac6112a3e..01ceebdf88e7 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/Makefile
+++ b/drivers/staging/vc04_services/bcm2835-audio/Makefile
@@ -1,5 +1,3 @@
# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_SND_BCM2835) += snd-bcm2835.o
snd-bcm2835-objs := bcm2835.o bcm2835-ctl.o bcm2835-pcm.o bcm2835-vchiq.o
-
-ccflags-y += -I $(srctree)/$(src)/../include
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
index 38b7451d77b2..0a81383c475a 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
@@ -6,11 +6,12 @@
#include <linux/device.h>
#include <linux/wait.h>
-#include <linux/raspberrypi/vchiq.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm-indirect.h>
+#include "../include/linux/raspberrypi/vchiq.h"
+
#define MAX_SUBSTREAMS (8)
#define AVAIL_SUBSTREAMS_MASK (0xff)
--
2.39.0
next prev parent reply other threads:[~2023-01-20 20:11 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-20 20:10 [PATCH v6 0/6] staging: vc04_services: vchiq: Register devices with a custom bus_type Umang Jain
2023-01-20 20:10 ` [PATCH v6 1/6] staging: vc04_services: Drop __VCCOREVER__ remnants Umang Jain
2023-01-20 20:11 ` Umang Jain [this message]
2023-01-20 20:11 ` [PATCH v6 3/6] staging: vc04_services: bcm2835-camera: Drop include Makefile directive Umang Jain
2023-01-20 20:11 ` [PATCH v6 4/6] staging: vc04_services: vchiq-mmal: " Umang Jain
2023-01-20 20:11 ` [PATCH v6 5/6] staging: vc04_services: interface: " Umang Jain
2023-01-20 20:11 ` [PATCH v6 6/6] staging: vc04_services: vchiq: Register devices with a custom bus_type Umang Jain
2023-01-22 23:50 ` Stefan Wahren
2023-01-23 18:11 ` Greg Kroah-Hartman
2023-01-23 18:22 ` Laurent Pinchart
2023-01-22 23:34 ` [PATCH v6 0/6] " Stefan Wahren
2023-01-23 7:48 ` Umang Jain
2023-01-23 8:58 ` Laurent Pinchart
2023-01-24 8:41 ` Stefan Wahren
2023-01-24 19:47 ` Phil Elwell
2023-01-26 13:33 ` Umang Jain
2023-01-23 11:46 ` Stefan Wahren
2023-01-23 14:12 ` Umang Jain
2023-01-23 15:28 ` Stefan Wahren
2023-01-23 17:28 ` Stefan Wahren
2023-01-24 5:39 ` Umang Jain
2023-01-24 8:26 ` Laurent Pinchart
2023-01-24 8:39 ` Stefan Wahren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230120201104.606876-3-umang.jain@ideasonboard.com \
--to=umang.jain@ideasonboard.com \
--cc=athierry@redhat.com \
--cc=dave.stevenson@raspberrypi.com \
--cc=error27@gmail.com \
--cc=f.fainelli@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=kieran.bingham@ideasonboard.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=linux-staging@lists.linux.dev \
--cc=paul.elder@ideasonboard.com \
--cc=stefan.wahren@i2se.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox