diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-24 16:00:01 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-24 16:00:01 -0300 |
commit | 0bc558f3ff40d347b70a653c5dfbe41a5e7f5297 (patch) | |
tree | 28229107d6ff0af80c99b61d2ae3cab63a29bd3c /linux/drivers/media/video/Kconfig | |
parent | b4fa52875a7178aba434e217a9cd39d25805dbe9 (diff) | |
parent | 24fde1a5a09b01f9b7557998aa9a88cff2ac844b (diff) | |
download | mediapointer-dvb-s2-0bc558f3ff40d347b70a653c5dfbe41a5e7f5297.tar.gz mediapointer-dvb-s2-0bc558f3ff40d347b70a653c5dfbe41a5e7f5297.tar.bz2 |
Merge from js 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/Kconfig')
-rw-r--r-- | linux/drivers/media/video/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index d82c8a30b..f6889f771 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -142,6 +142,16 @@ config VIDEO_CPIA_USB otherwise say N. This will not work with the Creative Webcam III. It is also available as a module (cpia_usb). +config VIDEO_CPIA2 + tristate "CPiA2 Video For Linux" + depends on VIDEO_DEV + ---help--- + This is the video4linux driver for cameras based on Vision's CPiA2 + (Colour Processor Interface ASIC), such as the Digital Blue QX5 + Microscope. If you have one of these cameras, say Y here + + This driver is also available as a module (cpia2). + config VIDEO_SAA5246A tristate "SAA5246A, SAA5281 Teletext processor" depends on VIDEO_DEV && I2C |