Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03fbdb2f authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: move videobuf2 to drivers/media/common 



Now that VB2 is used by both V4L2 and DVB core, move it to
the common part of the subsystem.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 4021053e

drivers/media/common/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ config CYPRESS_FIRMWARE 
	tristate "Cypress firmware helper routines"

	depends on USB



source "drivers/media/common/videobuf/Kconfig"

source "drivers/media/common/b2c2/Kconfig"

source "drivers/media/common/saa7146/Kconfig"

source "drivers/media/common/siano/Kconfig"

drivers/media/common/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y += b2c2/ saa7146/ siano/ v4l2-tpg/

obj-y += b2c2/ saa7146/ siano/ v4l2-tpg/ videobuf/

obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o

obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o

obj-$(CONFIG_CYPRESS_FIRMWARE) += cypress_firmware.o

drivers/media/common/videobuf/Kconfig

0 → 100644
+31 −0
Original line number Diff line number Diff line 
# Used by drivers that need Videobuf2 modules

config VIDEOBUF2_CORE

	select DMA_SHARED_BUFFER

	tristate



config VIDEOBUF2_MEMOPS

	tristate

	select FRAME_VECTOR



config VIDEOBUF2_DMA_CONTIG

	tristate

	depends on HAS_DMA

	select VIDEOBUF2_CORE

	select VIDEOBUF2_MEMOPS

	select DMA_SHARED_BUFFER



config VIDEOBUF2_VMALLOC

	tristate

	select VIDEOBUF2_CORE

	select VIDEOBUF2_MEMOPS

	select DMA_SHARED_BUFFER



config VIDEOBUF2_DMA_SG

	tristate

	depends on HAS_DMA

	select VIDEOBUF2_CORE

	select VIDEOBUF2_MEMOPS



config VIDEOBUF2_DVB

	tristate

	select VIDEOBUF2_CORE

drivers/media/common/videobuf/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 


obj-$(CONFIG_VIDEOBUF2_CORE) += videobuf2-core.o videobuf2-v4l2.o

obj-$(CONFIG_VIDEOBUF2_MEMOPS) += videobuf2-memops.o

obj-$(CONFIG_VIDEOBUF2_VMALLOC) += videobuf2-vmalloc.o

obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o

obj-$(CONFIG_VIDEOBUF2_DMA_SG) += videobuf2-dma-sg.o

obj-$(CONFIG_VIDEOBUF2_DVB) += videobuf2-dvb.o