tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Mauro Carvalho Chehab <mchehab@s-opensource.com>

Mauro Carvalho Chehab 03fbdb2f 4021053e

+40 -40
+1
drivers/media/common/Kconfig
··· 16 16 tristate "Cypress firmware helper routines" 17 17 depends on USB 18 18 19 + source "drivers/media/common/videobuf/Kconfig" 19 20 source "drivers/media/common/b2c2/Kconfig" 20 21 source "drivers/media/common/saa7146/Kconfig" 21 22 source "drivers/media/common/siano/Kconfig"
+1 -1
drivers/media/common/Makefile
··· 1 - obj-y += b2c2/ saa7146/ siano/ v4l2-tpg/ 1 + obj-y += b2c2/ saa7146/ siano/ v4l2-tpg/ videobuf/ 2 2 obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o 3 3 obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o 4 4 obj-$(CONFIG_CYPRESS_FIRMWARE) += cypress_firmware.o
+31
drivers/media/common/videobuf/Kconfig
··· 1 + # Used by drivers that need Videobuf2 modules 2 + config VIDEOBUF2_CORE 3 + select DMA_SHARED_BUFFER 4 + tristate 5 + 6 + config VIDEOBUF2_MEMOPS 7 + tristate 8 + select FRAME_VECTOR 9 + 10 + config VIDEOBUF2_DMA_CONTIG 11 + tristate 12 + depends on HAS_DMA 13 + select VIDEOBUF2_CORE 14 + select VIDEOBUF2_MEMOPS 15 + select DMA_SHARED_BUFFER 16 + 17 + config VIDEOBUF2_VMALLOC 18 + tristate 19 + select VIDEOBUF2_CORE 20 + select VIDEOBUF2_MEMOPS 21 + select DMA_SHARED_BUFFER 22 + 23 + config VIDEOBUF2_DMA_SG 24 + tristate 25 + depends on HAS_DMA 26 + select VIDEOBUF2_CORE 27 + select VIDEOBUF2_MEMOPS 28 + 29 + config VIDEOBUF2_DVB 30 + tristate 31 + select VIDEOBUF2_CORE
+7
drivers/media/common/videobuf/Makefile
··· 1 + 2 + obj-$(CONFIG_VIDEOBUF2_CORE) += videobuf2-core.o videobuf2-v4l2.o 3 + obj-$(CONFIG_VIDEOBUF2_MEMOPS) += videobuf2-memops.o 4 + obj-$(CONFIG_VIDEOBUF2_VMALLOC) += videobuf2-vmalloc.o 5 + obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o 6 + obj-$(CONFIG_VIDEOBUF2_DMA_SG) += videobuf2-dma-sg.o 7 + obj-$(CONFIG_VIDEOBUF2_DVB) += videobuf2-dvb.o
-32
drivers/media/v4l2-core/Kconfig
··· 79 79 config VIDEOBUF_DVB 80 80 tristate 81 81 select VIDEOBUF_GEN 82 - 83 - # Used by drivers that need Videobuf2 modules 84 - config VIDEOBUF2_CORE 85 - select DMA_SHARED_BUFFER 86 - tristate 87 - 88 - config VIDEOBUF2_MEMOPS 89 - tristate 90 - select FRAME_VECTOR 91 - 92 - config VIDEOBUF2_DMA_CONTIG 93 - tristate 94 - depends on HAS_DMA 95 - select VIDEOBUF2_CORE 96 - select VIDEOBUF2_MEMOPS 97 - select DMA_SHARED_BUFFER 98 - 99 - config VIDEOBUF2_VMALLOC 100 - tristate 101 - select VIDEOBUF2_CORE 102 - select VIDEOBUF2_MEMOPS 103 - select DMA_SHARED_BUFFER 104 - 105 - config VIDEOBUF2_DMA_SG 106 - tristate 107 - depends on HAS_DMA 108 - select VIDEOBUF2_CORE 109 - select VIDEOBUF2_MEMOPS 110 - 111 - config VIDEOBUF2_DVB 112 - tristate 113 - select VIDEOBUF2_CORE
-7
drivers/media/v4l2-core/Makefile
··· 33 33 obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o 34 34 obj-$(CONFIG_VIDEOBUF_DVB) += videobuf-dvb.o 35 35 36 - obj-$(CONFIG_VIDEOBUF2_CORE) += videobuf2-core.o videobuf2-v4l2.o 37 - obj-$(CONFIG_VIDEOBUF2_MEMOPS) += videobuf2-memops.o 38 - obj-$(CONFIG_VIDEOBUF2_VMALLOC) += videobuf2-vmalloc.o 39 - obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o 40 - obj-$(CONFIG_VIDEOBUF2_DMA_SG) += videobuf2-dma-sg.o 41 - obj-$(CONFIG_VIDEOBUF2_DVB) += videobuf2-dvb.o 42 - 43 36 ccflags-y += -I$(srctree)/drivers/media/dvb-core 44 37 ccflags-y += -I$(srctree)/drivers/media/dvb-frontends 45 38 ccflags-y += -I$(srctree)/drivers/media/tuners
drivers/media/v4l2-core/videobuf2-core.c drivers/media/common/videobuf/videobuf2-core.c
drivers/media/v4l2-core/videobuf2-dma-contig.c drivers/media/common/videobuf/videobuf2-dma-contig.c
drivers/media/v4l2-core/videobuf2-dma-sg.c drivers/media/common/videobuf/videobuf2-dma-sg.c
drivers/media/v4l2-core/videobuf2-dvb.c drivers/media/common/videobuf/videobuf2-dvb.c
drivers/media/v4l2-core/videobuf2-memops.c drivers/media/common/videobuf/videobuf2-memops.c
drivers/media/v4l2-core/videobuf2-v4l2.c drivers/media/common/videobuf/videobuf2-v4l2.c
drivers/media/v4l2-core/videobuf2-vmalloc.c drivers/media/common/videobuf/videobuf2-vmalloc.c