V4L/DVB: Remove obsolete ov511 driver

[net-next-2.6.git] / drivers / media / video / Kconfig

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index ad9e6f9c22e9a04473565a245c254ec7f21a3089..901ddd174020761639550fed95955044cf9191e5 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -559,7 +559,8 @@ config VIDEO_DAVINCI_VPIF
 
 config VIDEO_VIVI
        tristate "Virtual Video Driver"
-       depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64 && FONTS
+       depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64
+       depends on (FRAMEBUFFER_CONSOLE || STI_CONSOLE) && FONTS
        select FONT_8x16
        select VIDEOBUF_VMALLOC
        default n
@@ -646,7 +647,7 @@ config VIDEO_PMS
 
 config VIDEO_BWQCAM
        tristate "Quickcam BW Video For Linux"
-       depends on PARPORT && VIDEO_V4L1
+       depends on PARPORT && VIDEO_V4L2
        help
          Say Y have if you the black and white version of the QuickCam
          camera. See the next option for the color version.
@@ -656,7 +657,7 @@ config VIDEO_BWQCAM
 
 config VIDEO_CQCAM
        tristate "QuickCam Colour Video For Linux (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && PARPORT && VIDEO_V4L1
+       depends on EXPERIMENTAL && PARPORT && VIDEO_V4L2
        help
          This is the video4linux driver for the colour version of the
          Connectix QuickCam.  If you have one of these cameras, say Y here,
@@ -1039,22 +1040,6 @@ config USB_W9968CF
          To compile this driver as a module, choose M here: the
          module will be called w9968cf.
 
-config USB_OV511
-       tristate "USB OV511 Camera support (DEPRECATED)"
-       depends on VIDEO_V4L1
-       default n
-       ---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.
-
-         Say Y here if you want to connect this type of camera to your
-         computer's USB port. See <file:Documentation/video4linux/ov511.txt>
-         for more information and for a list of supported cameras.
-
-         To compile this driver as a module, choose M here: the
-         module will be called ov511.
-
 config USB_SE401
        tristate "USB SE401 Camera support"
        depends on VIDEO_V4L1