diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:34:34 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:34:34 -0400 |
commit | eff68d452f1a6842fb05218fd93c774ffc4dbc5a (patch) | |
tree | dacd3bd93b5f9260034bb206d7182c4a2bc6fac0 /drivers/media/video/Kconfig | |
parent | 6a9516989f94df10d9a27ba543c6b53b3e69c84a (diff) | |
parent | 95064a75ebf8744e1ff595e8cd7ff9b6c851523e (diff) | |
download | op-kernel-dev-eff68d452f1a6842fb05218fd93c774ffc4dbc5a.zip op-kernel-dev-eff68d452f1a6842fb05218fd93c774ffc4dbc5a.tar.gz |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/media/video/Kconfig')
-rw-r--r-- | drivers/media/video/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 732bf1e..94d078b 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -260,7 +260,7 @@ source "drivers/media/video/saa7134/Kconfig" config VIDEO_MXB tristate "Siemens-Nixdorf 'Multimedia eXtension Board'" - depends on PCI && VIDEO_V4L1 + depends on PCI && VIDEO_V4L1 && I2C select VIDEO_SAA7146_VV select VIDEO_TUNER ---help--- @@ -272,7 +272,7 @@ config VIDEO_MXB config VIDEO_DPC tristate "Philips-Semiconductors 'dpc7146 demonstration board'" - depends on PCI && VIDEO_V4L1 + depends on PCI && VIDEO_V4L1 && I2C select VIDEO_SAA7146_VV select VIDEO_V4L2 ---help--- @@ -287,7 +287,7 @@ config VIDEO_DPC config VIDEO_HEXIUM_ORION tristate "Hexium HV-PCI6 and Orion frame grabber" - depends on PCI && VIDEO_V4L1 + depends on PCI && VIDEO_V4L1 && I2C select VIDEO_SAA7146_VV select VIDEO_V4L2 ---help--- @@ -299,7 +299,7 @@ config VIDEO_HEXIUM_ORION config VIDEO_HEXIUM_GEMINI tristate "Hexium Gemini frame grabber" - depends on PCI && VIDEO_V4L1 + depends on PCI && VIDEO_V4L1 && I2C select VIDEO_SAA7146_VV select VIDEO_V4L2 ---help--- |