diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-20 14:03:19 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 01:05:10 -0400 |
commit | 5e2fb0824a5aa42c8d1b1b177ab287e84685be39 (patch) | |
tree | 79e7c3fca59938b113ab9e46cd01e2c873d8576b | |
parent | 657de3cd32285831a56f9f96deb85c64205c42fc (diff) |
V4L/DVB (4120): Ovcamship position at Kconfig changed
Ovcamship is used only on some USB webcams (OV511 and W9968CF)
Bettet to leave this item just after those webcams.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/video/Kconfig | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 1732fb56c8b0..9b23c1159ed2 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -312,17 +312,6 @@ config VIDEO_HEXIUM_GEMINI | |||
312 | 312 | ||
313 | source "drivers/media/video/cx88/Kconfig" | 313 | source "drivers/media/video/cx88/Kconfig" |
314 | 314 | ||
315 | config VIDEO_OVCAMCHIP | ||
316 | tristate "OmniVision Camera Chip support" | ||
317 | depends on I2C && VIDEO_V4L1 | ||
318 | ---help--- | ||
319 | Support for the OmniVision OV6xxx and OV7xxx series of camera chips. | ||
320 | This driver is intended to be used with the ov511 and w9968cf USB | ||
321 | camera drivers. | ||
322 | |||
323 | To compile this driver as a module, choose M here: the | ||
324 | module will be called ovcamchip. | ||
325 | |||
326 | config VIDEO_M32R_AR | 315 | config VIDEO_M32R_AR |
327 | tristate "AR devices" | 316 | tristate "AR devices" |
328 | depends on M32R && VIDEO_V4L1 | 317 | depends on M32R && VIDEO_V4L1 |
@@ -462,6 +451,35 @@ source "drivers/media/video/usbvideo/Kconfig" | |||
462 | 451 | ||
463 | source "drivers/media/video/et61x251/Kconfig" | 452 | source "drivers/media/video/et61x251/Kconfig" |
464 | 453 | ||
454 | config VIDEO_OVCAMCHIP | ||
455 | tristate "OmniVision Camera Chip support" | ||
456 | depends on I2C && VIDEO_V4L1 | ||
457 | ---help--- | ||
458 | Support for the OmniVision OV6xxx and OV7xxx series of camera chips. | ||
459 | This driver is intended to be used with the ov511 and w9968cf USB | ||
460 | camera drivers. | ||
461 | |||
462 | To compile this driver as a module, choose M here: the | ||
463 | module will be called ovcamchip. | ||
464 | |||
465 | config USB_W9968CF | ||
466 | tristate "USB W996[87]CF JPEG Dual Mode Camera support" | ||
467 | depends on USB && VIDEO_V4L1 && I2C | ||
468 | select VIDEO_OVCAMCHIP | ||
469 | ---help--- | ||
470 | Say Y here if you want support for cameras based on OV681 or | ||
471 | Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips. | ||
472 | |||
473 | This driver has an optional plugin, which is distributed as a | ||
474 | separate module only (released under GPL). It allows to use higher | ||
475 | resolutions and framerates, but cannot be included in the official | ||
476 | Linux kernel for performance purposes. | ||
477 | |||
478 | See <file:Documentation/video4linux/w9968cf.txt> for more info. | ||
479 | |||
480 | To compile this driver as a module, choose M here: the | ||
481 | module will be called w9968cf. | ||
482 | |||
465 | config USB_OV511 | 483 | config USB_OV511 |
466 | tristate "USB OV511 Camera support" | 484 | tristate "USB OV511 Camera support" |
467 | depends on USB && VIDEO_V4L1 | 485 | depends on USB && VIDEO_V4L1 |
@@ -498,24 +516,6 @@ config USB_STV680 | |||
498 | To compile this driver as a module, choose M here: the | 516 | To compile this driver as a module, choose M here: the |
499 | module will be called stv680. | 517 | module will be called stv680. |
500 | 518 | ||
501 | config USB_W9968CF | ||
502 | tristate "USB W996[87]CF JPEG Dual Mode Camera support" | ||
503 | depends on USB && VIDEO_V4L1 && I2C | ||
504 | select VIDEO_OVCAMCHIP | ||
505 | ---help--- | ||
506 | Say Y here if you want support for cameras based on OV681 or | ||
507 | Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips. | ||
508 | |||
509 | This driver has an optional plugin, which is distributed as a | ||
510 | separate module only (released under GPL). It allows to use higher | ||
511 | resolutions and framerates, but cannot be included in the official | ||
512 | Linux kernel for performance purposes. | ||
513 | |||
514 | See <file:Documentation/video4linux/w9968cf.txt> for more info. | ||
515 | |||
516 | To compile this driver as a module, choose M here: the | ||
517 | module will be called w9968cf. | ||
518 | |||
519 | source "drivers/media/video/zc0301/Kconfig" | 519 | source "drivers/media/video/zc0301/Kconfig" |
520 | 520 | ||
521 | source "drivers/media/video/pwc/Kconfig" | 521 | source "drivers/media/video/pwc/Kconfig" |