diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-10 14:47:26 -0400 |
| commit | f0cd91a68acdc9b49d7f6738b514a426da627649 (patch) | |
| tree | 8ad73564015794197583b094217ae0a71e71e753 /drivers/media/common/Kconfig | |
| parent | 60eef25701d25e99c991dd0f4a9f3832a0c3ad3e (diff) | |
| parent | 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 (diff) | |
Merge ../linux-2.6
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 |