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/cx88/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/cx88/Kconfig')
| -rw-r--r-- | drivers/media/video/cx88/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig index 0b9e5fac6239..b0f837588e01 100644 --- a/drivers/media/video/cx88/Kconfig +++ b/drivers/media/video/cx88/Kconfig | |||
| @@ -56,12 +56,12 @@ config VIDEO_CX88_DVB | |||
| 56 | select DVB_NXT200X if !DVB_FE_CUSTOMISE | 56 | select DVB_NXT200X if !DVB_FE_CUSTOMISE |
| 57 | select DVB_CX24123 if !DVB_FE_CUSTOMISE | 57 | select DVB_CX24123 if !DVB_FE_CUSTOMISE |
| 58 | select DVB_ISL6421 if !DVB_FE_CUSTOMISE | 58 | select DVB_ISL6421 if !DVB_FE_CUSTOMISE |
| 59 | select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE | ||
| 60 | select DVB_S5H1411 if !DVB_FE_CUSTOMISE | 59 | select DVB_S5H1411 if !DVB_FE_CUSTOMISE |
| 61 | select DVB_CX24116 if !DVB_FE_CUSTOMISE | 60 | select DVB_CX24116 if !DVB_FE_CUSTOMISE |
| 62 | select DVB_STV0299 if !DVB_FE_CUSTOMISE | 61 | select DVB_STV0299 if !DVB_FE_CUSTOMISE |
| 63 | select DVB_STV0288 if !DVB_FE_CUSTOMISE | 62 | select DVB_STV0288 if !DVB_FE_CUSTOMISE |
| 64 | select DVB_STB6000 if !DVB_FE_CUSTOMISE | 63 | select DVB_STB6000 if !DVB_FE_CUSTOMISE |
| 64 | select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE | ||
| 65 | ---help--- | 65 | ---help--- |
| 66 | This adds support for DVB/ATSC cards based on the | 66 | This adds support for DVB/ATSC cards based on the |
| 67 | Conexant 2388x chip. | 67 | Conexant 2388x chip. |