diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
| commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
| tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /drivers/media/video/Kconfig | |
| parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
| parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/media/video/Kconfig')
| -rw-r--r-- | drivers/media/video/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index fbe5b6168cc2..bf267552941f 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
| @@ -186,7 +186,7 @@ config VIDEO_KS0127 | |||
| 186 | 186 | ||
| 187 | config VIDEO_SAA7110 | 187 | config VIDEO_SAA7110 |
| 188 | tristate "Philips SAA7110 video decoder" | 188 | tristate "Philips SAA7110 video decoder" |
| 189 | depends on VIDEO_V4L1 | 189 | depends on VIDEO_V4L1 && I2C |
| 190 | ---help--- | 190 | ---help--- |
| 191 | Support for the Philips SAA7110 video decoders. | 191 | Support for the Philips SAA7110 video decoders. |
| 192 | 192 | ||