diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-25 10:28:18 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-25 10:28:18 -0300 |
| commit | a5d0568e2a686684ecdd1d6cb4edc48bceace249 (patch) | |
| tree | 08977650478c56476eec6f7a94affa7f5f6067fc /drivers/media/pci/cx25821/Kconfig | |
| parent | 966a1601877c3d29065ab2dde838cdae16ccc099 (diff) | |
| parent | 486a7a2813c7d6e0b864c4b51027bcae3359071e (diff) | |
| download | blackbird-op-linux-a5d0568e2a686684ecdd1d6cb4edc48bceace249.tar.gz blackbird-op-linux-a5d0568e2a686684ecdd1d6cb4edc48bceace249.zip | |
Merge branch 'topic/cx25821' into patchwork
* topic/cx25821: (31 commits)
[media] cx25821: remove cx25821-audio-upstream.c from the Makefile
[media] cx25821: replace custom ioctls with write()
[media] cx25821: drop cx25821-video-upstream-ch2.c/h
[media] cx25821: add output format ioctls
[media] cx25821: prepare querycap for output support
[media] cx25821: group all fmt functions together
[media] cx25821: setup output nodes correctly
[media] cx25821: remove references to subdevices that aren't there
[media] cx25821: remove custom ioctls that duplicate v4l2 ioctls
[media] cx25821: g/s/try/enum_fmt related fixes and cleanups
[media] cx25821: switch to v4l2_fh, add event and prio handling
[media] cx25821: replace resource management functions with fh ownership
[media] cx25821: move vidq from cx25821_fh to cx25821_channel
[media] cx25821: remove 'type' field from cx25821_fh
[media] cx25821: use core locking
[media] cx25821: remove unnecessary debug messages
[media] cx25821: remove TRUE/FALSE/STATUS_(UN)SUCCESSFUL defines
[media] cx25821: convert to the control framework
[media] cx25821: embed video_device, clean up some kernel log spam
[media] cx25821: remove bogus dependencies
...
Diffstat (limited to 'drivers/media/pci/cx25821/Kconfig')
| -rw-r--r-- | drivers/media/pci/cx25821/Kconfig | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/pci/cx25821/Kconfig b/drivers/media/pci/cx25821/Kconfig index 4017c9420348..6439a847680c 100644 --- a/drivers/media/pci/cx25821/Kconfig +++ b/drivers/media/pci/cx25821/Kconfig @@ -1,14 +1,9 @@ config VIDEO_CX25821 tristate "Conexant cx25821 support" - depends on DVB_CORE && VIDEO_DEV && PCI && I2C + depends on VIDEO_DEV && PCI && I2C select I2C_ALGOBIT select VIDEO_BTCX - select VIDEO_TVEEPROM - depends on RC_CORE - select VIDEOBUF_DVB select VIDEOBUF_DMA_SG - select VIDEO_CX25840 - select VIDEO_CX2341X ---help--- This is a video4linux driver for Conexant 25821 based TV cards. |
