Commit 2beeddb3 authored Jan 21, 2023 by Umang Jain Committed by Greg Kroah-Hartman Jan 23, 2023

staging: vc04_services: Drop VCCOREVER remnants

Commit 8ba5f91b ("staging: vc04_services: remove __VCCOREVER__")
was meant to remove all of __VCCOREVER__ definitions but missed to
remove a few. Hence, drop them now.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://lore.kernel.org/r/20230120201104.606876-2-umang.jain@ideasonboard.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 3f954e22

drivers/staging/vc04_services/bcm2835-audio/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2,4 +2,4 @@
	obj-$(CONFIG_SND_BCM2835) += snd-bcm2835.o		obj-$(CONFIG_SND_BCM2835) += snd-bcm2835.o
	snd-bcm2835-objs := bcm2835.o bcm2835-ctl.o bcm2835-pcm.o bcm2835-vchiq.o		snd-bcm2835-objs := bcm2835.o bcm2835-ctl.o bcm2835-pcm.o bcm2835-vchiq.o

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

drivers/staging/vc04_services/bcm2835-camera/Makefile

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -7,5 +7,4 @@ obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-v4l2.o

	ccflags-y += \		ccflags-y += \
	-I $(srctree)/$(src)/.. \		-I $(srctree)/$(src)/.. \
	-I $(srctree)/$(src)/../vchiq-mmal/ \		-I $(srctree)/$(src)/../vchiq-mmal/
	-D__VCCOREVER__=0x04000000

drivers/staging/vc04_services/vchiq-mmal/Makefile

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5,5 +5,4 @@ obj-$(CONFIG_BCM2835_VCHIQ_MMAL) += bcm2835-mmal-vchiq.o

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