Commit 2ad4ba07 authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Greg Kroah-Hartman
Browse files

staging: vchiq: Move vchiq.h into include directory 



To make the separation clear between vchiq's header files and vchiq.h,
which is to be used by services and is the 'public' API, move it into a
dedicated includes directory.

Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>

Link: https://lore.kernel.org/r/20200629150945.10720-48-nsaenzjulienne@suse.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5ada309f

drivers/staging/vc04_services/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,5 +12,5 @@ obj-$(CONFIG_SND_BCM2835) += bcm2835-audio/ 
obj-$(CONFIG_VIDEO_BCM2835)		+= bcm2835-camera/

obj-$(CONFIG_BCM2835_VCHIQ_MMAL)	+= vchiq-mmal/



ccflags-y += -D__VCCOREVER__=0x04000000

ccflags-y += -I $(srctree)/$(src)/include  -D__VCCOREVER__=0x04000000

drivers/staging/vc04_services/bcm2835-audio/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ 
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)/.. -D__VCCOREVER__=0x04000000
 
ccflags-y += -I $(srctree)/$(src)/../include -D__VCCOREVER__=0x04000000

drivers/staging/vc04_services/bcm2835-audio/bcm2835.h

+1 −1
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ 


#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 "interface/vchiq_arm/vchiq.h"



#define MAX_SUBSTREAMS   (8)

#define AVAIL_SUBSTREAMS_MASK  (0xff)

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

+1 −1
Original line number Diff line number Diff line
@@ -10,10 +10,10 @@ 
#include <linux/kref.h>

#include <linux/rcupdate.h>

#include <linux/wait.h>

#include <linux/raspberrypi/vchiq.h>



#include "vchiq_cfg.h"



#include "vchiq.h"



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

#if IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE)

CRA Git | Maintained and supported by SUSTech CRA and CCSE