summaryrefslogtreecommitdiffstats
path: root/drivers/media/common/Kconfig
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-05-24 01:32:42 -0400
committerJeff Garzik <jeff@garzik.org>2006-05-24 01:32:42 -0400
commit26e27cd424554202d36f38ee35421143788da127 (patch)
tree04d068c76af5b636c061173465faa574d4b5e7b0 /drivers/media/common/Kconfig
parentb74ba22f030eb7ab88f7d8954ad18ecc0ac5ce3c (diff)
parent387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff)
downloadkernel-crypto-26e27cd424554202d36f38ee35421143788da127.tar.gz
kernel-crypto-26e27cd424554202d36f38ee35421143788da127.tar.xz
kernel-crypto-26e27cd424554202d36f38ee35421143788da127.zip
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/media/common/Kconfig')
-rw-r--r--drivers/media/common/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index 6a901a0268e..9c45b983e0d 100644
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -4,6 +4,7 @@ config VIDEO_SAA7146
config VIDEO_SAA7146_VV
tristate
+ select VIDEO_V4L2
select VIDEO_BUF
select VIDEO_VIDEOBUF
select VIDEO_SAA7146