---

yaml --- r: 241755 b: refs/heads/master c: e23ccc0 h: refs/heads/master i: 241753: 76e06a1 241751: b619838 v: v3
git-mirror · Mar 21, 2011 · 9e01fb9 · 9e01fb9
1 parent 8dfdd98
commit 9e01fb9
Show file tree

Hide file tree

Showing 5 changed files with 1,782 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52a3082fea41ffe77003be76ac1496d60bb7908e
+refs/heads/master: e23ccc0ad9258634e6d52cedf473b35dc34416c7
diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig
@@ -44,6 +44,9 @@ config V4L2_MEM2MEM_DEV
 	tristate
 	depends on VIDEOBUF_GEN
 
+config VIDEOBUF2_CORE
+	tristate
+
 #
 # Multimedia Video device configuration
 #

diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile
@@ -111,6 +111,8 @@ obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o
 obj-$(CONFIG_VIDEOBUF_DVB) += videobuf-dvb.o
 obj-$(CONFIG_VIDEO_BTCX)  += btcx-risc.o
 
+obj-$(CONFIG_VIDEOBUF2_CORE)		+= videobuf2-core.o
+
 obj-$(CONFIG_V4L2_MEM2MEM_DEV) += v4l2-mem2mem.o
 
 obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o