diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
| commit | 1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch) | |
| tree | 64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /drivers/media/common/Kconfig | |
| parent | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/media/common/Kconfig')
| -rw-r--r-- | drivers/media/common/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig index 1a04db4552da..f33e5d973413 100644 --- a/drivers/media/common/Kconfig +++ b/drivers/media/common/Kconfig | |||
| @@ -4,7 +4,6 @@ config VIDEO_SAA7146 | |||
| 4 | 4 | ||
| 5 | config VIDEO_SAA7146_VV | 5 | config VIDEO_SAA7146_VV |
| 6 | tristate | 6 | tristate |
| 7 | select VIDEO_V4L2 | ||
| 8 | select VIDEO_BUF | 7 | select VIDEO_BUF |
| 9 | select VIDEO_VIDEOBUF | 8 | select VIDEO_VIDEOBUF |
| 10 | select VIDEO_SAA7146 | 9 | select VIDEO_SAA7146 |