diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
| commit | c324b44c34050cf2a9b58830e11c974806bd85d8 (patch) | |
| tree | 3ac45a783221283925cd698334a8f5e7dd4c1df8 /drivers/media/dvb/bt8xx/Kconfig | |
| parent | 2fcf522509cceea524b6e7ece8fd6759b682175a (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/media/dvb/bt8xx/Kconfig')
| -rw-r--r-- | drivers/media/dvb/bt8xx/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig index b12545f093f8..1e85d16491b0 100644 --- a/drivers/media/dvb/bt8xx/Kconfig +++ b/drivers/media/dvb/bt8xx/Kconfig | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | config DVB_BT8XX | 1 | config DVB_BT8XX |
| 2 | tristate "Nebula/Pinnacle PCTV/Twinhan PCI cards" | 2 | tristate "BT8xx based PCI cards" |
| 3 | depends on DVB_CORE && PCI && VIDEO_BT848 | 3 | depends on DVB_CORE && PCI && VIDEO_BT848 |
| 4 | select DVB_MT352 | 4 | select DVB_MT352 |
| 5 | select DVB_SP887X | 5 | select DVB_SP887X |
| @@ -8,8 +8,8 @@ config DVB_BT8XX | |||
| 8 | select DVB_OR51211 | 8 | select DVB_OR51211 |
| 9 | help | 9 | help |
| 10 | Support for PCI cards based on the Bt8xx PCI bridge. Examples are | 10 | Support for PCI cards based on the Bt8xx PCI bridge. Examples are |
| 11 | the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards and | 11 | the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards, |
| 12 | pcHDTV HD2000 cards. | 12 | the pcHDTV HD2000 cards, and certain AVerMedia cards. |
| 13 | 13 | ||
| 14 | Since these cards have no MPEG decoder onboard, they transmit | 14 | Since these cards have no MPEG decoder onboard, they transmit |
| 15 | only compressed MPEG data over the PCI bus, so you need | 15 | only compressed MPEG data over the PCI bus, so you need |