diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-24 13:24:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-24 13:24:52 -0500 |
| commit | c20137fc5329eaf24093fc48c52608dc66be8e5c (patch) | |
| tree | b6921a20df62076e3cb67d140e46f7056f139a5d /drivers/media/video/cx18/Kconfig | |
| parent | 1806f826554efd206cebacc7f9f213c8e6493a5d (diff) | |
| parent | 231ffc9c07021afcfb1afa229aa4935730e5163b (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
V4L/DVB (9920): em28xx: fix NULL pointer dereference in call to VIDIOC_INT_RESET command
V4L/DVB (9908a): MAINTAINERS: mark linux-uvc-devel as subscribers only
V4L/DVB (9906): v4l2-compat: test for unlocked_ioctl as well.
V4L/DVB (9885): drivers/media Kconfig's: fix bugzilla #12204
V4L/DVB (9875): gspca - main: Fix vidioc_s_jpegcomp locking.
V4L/DVB (9781): [PATCH] Cablestar 2 I2C retries (fix CableStar2 support)
V4L/DVB (9780): dib0700: Stop repeating after user stops pushing button
Diffstat (limited to 'drivers/media/video/cx18/Kconfig')
| -rw-r--r-- | drivers/media/video/cx18/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig index ef48565de7f1..8940b5387dec 100644 --- a/drivers/media/video/cx18/Kconfig +++ b/drivers/media/video/cx18/Kconfig | |||
| @@ -9,7 +9,7 @@ config VIDEO_CX18 | |||
| 9 | select VIDEO_CX2341X | 9 | select VIDEO_CX2341X |
| 10 | select VIDEO_CS5345 | 10 | select VIDEO_CS5345 |
| 11 | select DVB_S5H1409 if !DVB_FE_CUSTOMISE | 11 | select DVB_S5H1409 if !DVB_FE_CUSTOMISE |
| 12 | select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE | 12 | select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE |
| 13 | ---help--- | 13 | ---help--- |
| 14 | This is a video4linux driver for Conexant cx23418 based | 14 | This is a video4linux driver for Conexant cx23418 based |
| 15 | PCI combo video recorder devices. | 15 | PCI combo video recorder devices. |