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/dvb/ttpci | |
| 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/dvb/ttpci')
| -rw-r--r-- | drivers/media/dvb/ttpci/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig index 867027ceab3e..401a04effc06 100644 --- a/drivers/media/dvb/ttpci/Kconfig +++ b/drivers/media/dvb/ttpci/Kconfig | |||
| @@ -106,7 +106,7 @@ config DVB_BUDGET_CI | |||
| 106 | select DVB_TDA1004X if !DVB_FE_CUSTOMISE | 106 | select DVB_TDA1004X if !DVB_FE_CUSTOMISE |
| 107 | select DVB_LNBP21 if !DVB_FE_CUSTOMISE | 107 | select DVB_LNBP21 if !DVB_FE_CUSTOMISE |
| 108 | select DVB_TDA10023 if !DVB_FE_CUSTOMISE | 108 | select DVB_TDA10023 if !DVB_FE_CUSTOMISE |
| 109 | select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE | 109 | select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE |
| 110 | select VIDEO_IR | 110 | select VIDEO_IR |
| 111 | help | 111 | help |
| 112 | Support for simple SAA7146 based DVB cards | 112 | Support for simple SAA7146 based DVB cards |