diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-12 20:33:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-12 20:33:42 -0400 |
commit | 7366935a498fcd3d87871518f71b67e43c62493d (patch) | |
tree | 6fc81951443d793897bb96639af42f997f6f2f6e /drivers/media/video/cx88 | |
parent | 3ee4b889a0708e6503dca0f771c2d84f56602a18 (diff) | |
parent | e7ea8fc285c5ac9040ae80b01d529ea453f1b647 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (4608c): Fix I2C dependencies for saa7146 modules
V4L/DVB (4608b): i2c deps fix on DVB
V4L/DVB (4605): Fixes an issue with V4L1 and make headers-install
V4L/DVB (4520): Fix an error when loading bttv driver on PV M4900.
V4L/DVB (4511): Restore tuner_ymec_tvf66t5_b_dff_pal_ranges[] to fix UHF switch functionality
V4L/DVB (4494a): Fix compilation when V4L1 support is not present
Diffstat (limited to 'drivers/media/video/cx88')
-rw-r--r-- | drivers/media/video/cx88/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig index 80e23ee9801c..7a94e6a11927 100644 --- a/drivers/media/video/cx88/Kconfig +++ b/drivers/media/video/cx88/Kconfig | |||
@@ -51,6 +51,7 @@ config VIDEO_CX88_DVB | |||
51 | tristate "DVB/ATSC Support for cx2388x based TV cards" | 51 | tristate "DVB/ATSC Support for cx2388x based TV cards" |
52 | depends on VIDEO_CX88 && DVB_CORE | 52 | depends on VIDEO_CX88 && DVB_CORE |
53 | select VIDEO_BUF_DVB | 53 | select VIDEO_BUF_DVB |
54 | select DVB_PLL | ||
54 | ---help--- | 55 | ---help--- |
55 | This adds support for DVB/ATSC cards based on the | 56 | This adds support for DVB/ATSC cards based on the |
56 | Conexant 2388x chip. | 57 | Conexant 2388x chip. |