diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:16 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:16 -0400 |
| commit | 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 (patch) | |
| tree | e65562d7300ac653207b1e45ec7e5960ddf78fff /drivers/media/video | |
| parent | be697c3f137c9ed808753bbbc5d7751c6e5303fc (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 93570355819a..bbb989df4cf0 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
| @@ -262,7 +262,6 @@ config VIDEO_SAA7134_DVB | |||
| 262 | depends on VIDEO_SAA7134 && DVB_CORE | 262 | depends on VIDEO_SAA7134 && DVB_CORE |
| 263 | select VIDEO_BUF_DVB | 263 | select VIDEO_BUF_DVB |
| 264 | select DVB_MT352 | 264 | select DVB_MT352 |
| 265 | select DVB_CX22702 | ||
| 266 | select DVB_TDA1004X | 265 | select DVB_TDA1004X |
| 267 | ---help--- | 266 | ---help--- |
| 268 | This adds support for DVB cards based on the | 267 | This adds support for DVB cards based on the |