Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353653
b: refs/heads/master
c: e141a48
h: refs/heads/master
i:
  353651: 198c824
v: v3
  • Loading branch information
Kees Cook authored and Greg Kroah-Hartman committed Jan 21, 2013
1 parent 830fc38 commit f55719a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 80ec213592f568721315287c779004f6c715c7a8
refs/heads/master: e141a48185193b3cf71ba311276b4c0f51685d99
8 changes: 4 additions & 4 deletions trunk/drivers/media/platform/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ config VIDEO_OMAP2
This is a v4l2 driver for the TI OMAP2 camera capture interface

config VIDEO_OMAP3
tristate "OMAP 3 Camera support (EXPERIMENTAL)"
depends on OMAP_IOVMM && VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 && EXPERIMENTAL
tristate "OMAP 3 Camera support"
depends on OMAP_IOVMM && VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3
---help---
Driver for an OMAP 3 camera controller.

Expand Down Expand Up @@ -169,8 +169,8 @@ config VIDEO_SAMSUNG_S5P_G2D
2d graphics accelerator.

config VIDEO_SAMSUNG_S5P_JPEG
tristate "Samsung S5P/Exynos4 JPEG codec driver (EXPERIMENTAL)"
depends on VIDEO_DEV && VIDEO_V4L2 && PLAT_S5P && EXPERIMENTAL
tristate "Samsung S5P/Exynos4 JPEG codec driver"
depends on VIDEO_DEV && VIDEO_V4L2 && PLAT_S5P
select VIDEOBUF2_DMA_CONTIG
select V4L2_MEM2MEM_DEV
---help---
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/usb/dvb-usb-v2/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ config DVB_USB_MXL111SF

config DVB_USB_RTL28XXU
tristate "Realtek RTL28xxU DVB USB support"
depends on DVB_USB_V2 && EXPERIMENTAL
depends on DVB_USB_V2
select DVB_RTL2830
select DVB_RTL2832
select MEDIA_TUNER_QT1010 if MEDIA_SUBDRV_AUTOSELECT
Expand Down

0 comments on commit f55719a

Please sign in to comment.