1 files changed, 29 insertions, 4 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index e6186b338a12..9dc74c93bf24 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -600,7 +600,7 @@ source "drivers/media/video/bt8xx/Kconfig"
 
 config VIDEO_PMS
         tristate "Mediavision Pro Movie Studio Video For Linux"
-        depends on ISA && VIDEO_V4L1
+        depends on ISA && VIDEO_V4L2
         help
           Say Y if you have such a thing.
 
@@ -847,6 +847,12 @@ config SOC_CAMERA_MT9V022
         help
           This driver supports MT9V022 cameras from Micron
 
+config SOC_CAMERA_RJ54N1
+        tristate "rj54n1cb0c support"
+        depends on SOC_CAMERA && I2C
+        help
+          This is a rj54n1cb0c video driver
+
 config SOC_CAMERA_TW9910
         tristate "tw9910 support"
         depends on SOC_CAMERA && I2C
@@ -865,6 +871,12 @@ config SOC_CAMERA_OV772X
         help
           This is a ov772x camera driver
 
+config SOC_CAMERA_OV9640
+        tristate "ov9640 camera support"
+        depends on SOC_CAMERA && I2C
+        help
+          This is a ov9640 camera driver
+
 config MX1_VIDEO
         bool
 
@@ -939,9 +951,14 @@ source "drivers/media/video/usbvideo/Kconfig"
 source "drivers/media/video/et61x251/Kconfig"
 
 config VIDEO_OVCAMCHIP
-        tristate "OmniVision Camera Chip support"
+        tristate "OmniVision Camera Chip support (DEPRECATED)"
         depends on I2C && VIDEO_V4L1
         ---help---
+          This driver is DEPRECATED please use the gspca ov519 module
+          instead. Note that for the ov511 / ov518 support of the gspca module
+          you need atleast version 0.6.0 of libv4l and for the w9968cf
+          atleast version 0.6.3 of libv4l.
+
           Support for the OmniVision OV6xxx and OV7xxx series of camera chips.
           This driver is intended to be used with the ov511 and w9968cf USB
           camera drivers.
@@ -950,9 +967,13 @@ config VIDEO_OVCAMCHIP
           module will be called ovcamchip.
 
 config USB_W9968CF
-        tristate "USB W996[87]CF JPEG Dual Mode Camera support"
+        tristate "USB W996[87]CF JPEG Dual Mode Camera support (DEPRECATED)"
         depends on VIDEO_V4L1 && I2C && VIDEO_OVCAMCHIP
         ---help---
+          This driver is DEPRECATED please use the gspca ov519 module
+          instead. Note that for the w9968cf support of the gspca module
+          you need atleast version 0.6.3 of libv4l.
+
           Say Y here if you want support for cameras based on OV681 or
           Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.
 
@@ -995,9 +1016,13 @@ config USB_SE401
 source "drivers/media/video/sn9c102/Kconfig"
 
 config USB_STV680
-        tristate "USB STV680 (Pencam) Camera support"
+        tristate "USB STV680 (Pencam) Camera support (DEPRECATED)"
         depends on VIDEO_V4L1
         ---help---
+          This driver is DEPRECATED please use the gspca stv0680 module
+          instead. Note that for the gspca stv0680 module you need
+          atleast version 0.6.3 of libv4l.
+
           Say Y here if you want to connect this type of camera to your
           computer's USB port. This includes the Pencam line of cameras.
           See <file:Documentation/video4linux/stv680.txt> for more information