diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
| commit | d932cb7e630cae3b6b5307b767d296ff1a597c5e (patch) | |
| tree | f930d068a12a256fabef0864bcdf8e85f095369e /drivers/media/video/Kconfig | |
| parent | 73b59a3b1c09e4bfc678400b77b96134dcfbf112 (diff) | |
| parent | f5d635f649607b09b0b4620d25d028fd2b1b7ea5 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/media/video/Kconfig')
| -rw-r--r-- | drivers/media/video/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 6d532f170ce5..fe56862d51e4 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
| @@ -145,7 +145,7 @@ config VIDEO_SAA5246A | |||
| 145 | 145 | ||
| 146 | config VIDEO_SAA5249 | 146 | config VIDEO_SAA5249 |
| 147 | tristate "SAA5249 Teletext processor" | 147 | tristate "SAA5249 Teletext processor" |
| 148 | depends on VIDEO_DEV && I2C | 148 | depends on VIDEO_DEV && I2C && VIDEO_V4L1 |
| 149 | help | 149 | help |
| 150 | Support for I2C bus based teletext using the SAA5249 chip. At the | 150 | Support for I2C bus based teletext using the SAA5249 chip. At the |
| 151 | moment this is only useful on some European WinTV cards. | 151 | moment this is only useful on some European WinTV cards. |
| @@ -155,7 +155,7 @@ config VIDEO_SAA5249 | |||
| 155 | 155 | ||
| 156 | config TUNER_3036 | 156 | config TUNER_3036 |
| 157 | tristate "SAB3036 tuner" | 157 | tristate "SAB3036 tuner" |
| 158 | depends on VIDEO_DEV && I2C | 158 | depends on VIDEO_DEV && I2C && VIDEO_V4L1 |
| 159 | help | 159 | help |
| 160 | Say Y here to include support for Philips SAB3036 compatible tuners. | 160 | Say Y here to include support for Philips SAB3036 compatible tuners. |
| 161 | If in doubt, say N. | 161 | If in doubt, say N. |