diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 06:44:44 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 06:44:44 -0300 |
commit | ba6db43dd8d3f7fa51679331c85c2c64c848e8db (patch) | |
tree | 3883996e10432cb5f8584aec046037bb122ebba1 /linux/drivers/media/video/cpia2 | |
parent | 092502207af0ea4f41035bff5672a29f83ee0904 (diff) | |
parent | 6b2a73a9cbdfcc7420efb77a3252984dd3a5e0a9 (diff) | |
download | mediapointer-dvb-s2-ba6db43dd8d3f7fa51679331c85c2c64c848e8db.tar.gz mediapointer-dvb-s2-ba6db43dd8d3f7fa51679331c85c2c64c848e8db.tar.bz2 |
merge from endriss tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cpia2')
-rw-r--r-- | linux/drivers/media/video/cpia2/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cpia2/Kconfig b/linux/drivers/media/video/cpia2/Kconfig index 1c09ef981..513cc0927 100644 --- a/linux/drivers/media/video/cpia2/Kconfig +++ b/linux/drivers/media/video/cpia2/Kconfig @@ -1,6 +1,6 @@ config VIDEO_CPIA2 tristate "CPiA2 Video For Linux" - depends on VIDEO_DEV + depends on VIDEO_DEV && USB ---help--- This is the video4linux driver for cameras based on Vision's CPiA2 (Colour Processor Interface ASIC), such as the Digital Blue QX5 |