diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-25 12:40:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-25 12:40:08 -0400 |
| commit | c6a756795d5ba0637aae8da89dd11bb7e3a1ee74 (patch) | |
| tree | 1c19f951f2604dbb6b867a6dcdf94d20c204cc5c /drivers/media/common/Kconfig | |
| parent | 382066da251132f768380f4852ed5afb72d88f80 (diff) | |
| parent | a8bd60705aa17a998516837d9c1e503ad4cbd7fc (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/media/common/Kconfig')
| -rw-r--r-- | drivers/media/common/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig index 6a901a0268e1..1a04db4552da 100644 --- a/drivers/media/common/Kconfig +++ b/drivers/media/common/Kconfig | |||
| @@ -1,9 +1,10 @@ | |||
| 1 | config VIDEO_SAA7146 | 1 | config VIDEO_SAA7146 |
| 2 | tristate | 2 | tristate |
| 3 | select I2C | 3 | depends on I2C |
| 4 | 4 | ||
| 5 | config VIDEO_SAA7146_VV | 5 | config VIDEO_SAA7146_VV |
| 6 | tristate | 6 | tristate |
| 7 | select VIDEO_V4L2 | ||
| 7 | select VIDEO_BUF | 8 | select VIDEO_BUF |
| 8 | select VIDEO_VIDEOBUF | 9 | select VIDEO_VIDEOBUF |
| 9 | select VIDEO_SAA7146 | 10 | select VIDEO_SAA7146 |