Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 241764
b: refs/heads/master
c: 908a0d7
h: refs/heads/master
v: v3
  • Loading branch information
Marek Szyprowski authored and Mauro Carvalho Chehab committed Mar 21, 2011
1 parent 5db9908 commit e8855d9
Show file tree
Hide file tree
Showing 4 changed files with 153 additions and 141 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 53b5d5749b6fcca37c7ad60cd40feafadd390b70
refs/heads/master: 908a0d7c588ef87e5cf0a26805e6002a78ac9d13
4 changes: 3 additions & 1 deletion trunk/drivers/media/video/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ config VIDEO_TUNER

config V4L2_MEM2MEM_DEV
tristate
depends on VIDEOBUF_GEN
depends on VIDEOBUF2_CORE

config VIDEOBUF2_CORE
tristate
Expand Down Expand Up @@ -989,6 +989,7 @@ if V4L_MEM2MEM_DRIVERS
config VIDEO_MEM2MEM_TESTDEV
tristate "Virtual test device for mem2mem framework"
depends on VIDEO_DEV && VIDEO_V4L2
depends on BROKEN
select VIDEOBUF_VMALLOC
select V4L2_MEM2MEM_DEV
default n
Expand All @@ -999,6 +1000,7 @@ config VIDEO_MEM2MEM_TESTDEV
config VIDEO_SAMSUNG_S5P_FIMC
tristate "Samsung S5P FIMC (video postprocessor) driver"
depends on VIDEO_DEV && VIDEO_V4L2 && PLAT_S5P
depends on BROKEN
select VIDEOBUF_DMA_CONTIG
select V4L2_MEM2MEM_DEV
help
Expand Down
Loading

0 comments on commit e8855d9

Please sign in to comment.