diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 13:09:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 13:09:31 -0400 |
| commit | 25581ad107be24b89d805da51a03d616f8f3d1be (patch) | |
| tree | 36e2bd32667b5dd5a39e1939c1c5162f18967715 /drivers/media/dvb/ttpci/Kconfig | |
| parent | 72cf2709bf8e0410800f118c4298bfbf8715b303 (diff) | |
| parent | 7477ddaa4d2d69bbcd49e12990af158dbb03f2f2 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (244 commits)
V4L/DVB (4210b): git-dvb: tea575x-tuner build fix
V4L/DVB (4210a): git-dvb versus matroxfb
V4L/DVB (4209): Added some BTTV PCI IDs for newer boards
Fixes some sync issues between V4L/DVB development and GIT
V4L/DVB (4206): Cx88-blackbird: always set encoder height based on tvnorm->id
V4L/DVB (4205): Merge tda9887 module into tuner.
V4L/DVB (4203): Explicitly set the enum values.
V4L/DVB (4202): allow selecting CX2341x port mode
V4L/DVB (4200): Disable bitrate_mode when encoding mpeg-1.
V4L/DVB (4199): Add cx2341x-specific control array to cx2341x.c
V4L/DVB (4198): Avoid newer usages of obsoleted experimental MPEGCOMP API
V4L/DVB (4197): Port new MPEG API to saa7134-empress with saa6752hs
V4L/DVB (4196): Port cx88-blackbird to the new MPEG API.
V4L/DVB (4193): Update cx2341x fw encoding API doc.
V4L/DVB (4192): Use control helpers for saa7115, cx25840, msp3400.
V4L/DVB (4191): Add CX2341X MPEG encoder module.
V4L/DVB (4190): Add helper functions for control processing to v4l2-common.
V4L/DVB (4189): Add videodev support for VIDIOC_S/G/TRY_EXT_CTRLS.
V4L/DVB (4188): Add new MPEG control/ioctl definitions to videodev2.h
V4L/DVB (4186): Add support for the DNTV Live! mini DVB-T card.
...
Diffstat (limited to 'drivers/media/dvb/ttpci/Kconfig')
| -rw-r--r-- | drivers/media/dvb/ttpci/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig index b5ac7dfde52f..987881fa988c 100644 --- a/drivers/media/dvb/ttpci/Kconfig +++ b/drivers/media/dvb/ttpci/Kconfig | |||
| @@ -10,6 +10,7 @@ config DVB_AV7110 | |||
| 10 | select DVB_SP8870 | 10 | select DVB_SP8870 |
| 11 | select DVB_STV0297 | 11 | select DVB_STV0297 |
| 12 | select DVB_L64781 | 12 | select DVB_L64781 |
| 13 | select DVB_LNBP21 | ||
| 13 | help | 14 | help |
| 14 | Support for SAA7146 and AV7110 based DVB cards as produced | 15 | Support for SAA7146 and AV7110 based DVB cards as produced |
| 15 | by Fujitsu-Siemens, Technotrend, Hauppauge and others. | 16 | by Fujitsu-Siemens, Technotrend, Hauppauge and others. |
| @@ -67,6 +68,7 @@ config DVB_BUDGET | |||
| 67 | select DVB_TDA8083 | 68 | select DVB_TDA8083 |
| 68 | select DVB_TDA10021 | 69 | select DVB_TDA10021 |
| 69 | select DVB_S5H1420 | 70 | select DVB_S5H1420 |
| 71 | select DVB_LNBP21 | ||
| 70 | help | 72 | help |
| 71 | Support for simple SAA7146 based DVB cards | 73 | Support for simple SAA7146 based DVB cards |
| 72 | (so called Budget- or Nova-PCI cards) without onboard | 74 | (so called Budget- or Nova-PCI cards) without onboard |
| @@ -84,6 +86,7 @@ config DVB_BUDGET_CI | |||
| 84 | select DVB_STV0297 | 86 | select DVB_STV0297 |
| 85 | select DVB_STV0299 | 87 | select DVB_STV0299 |
| 86 | select DVB_TDA1004X | 88 | select DVB_TDA1004X |
| 89 | select DVB_LNBP21 | ||
| 87 | help | 90 | help |
| 88 | Support for simple SAA7146 based DVB cards | 91 | Support for simple SAA7146 based DVB cards |
| 89 | (so called Budget- or Nova-PCI cards) without onboard | 92 | (so called Budget- or Nova-PCI cards) without onboard |