V4L/DVB: Remove obsolete stv680 v4l1 driver

[cascardo/linux.git] / drivers / media / video / Kconfig

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index bdbc9d3..de09864 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
@@ -1000,61 +1001,6 @@ source "drivers/media/video/usbvideo/Kconfig"
 
 source "drivers/media/video/et61x251/Kconfig"
 
-config VIDEO_OVCAMCHIP
-       tristate "OmniVision Camera Chip support (DEPRECATED)"
-       depends on I2C && 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 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.
-
-         To compile this driver as a module, choose M here: the
-         module will be called ovcamchip.
-
-config USB_W9968CF
-       tristate "USB W996[87]CF JPEG Dual Mode Camera support (DEPRECATED)"
-       depends on VIDEO_V4L1 && I2C && VIDEO_OVCAMCHIP
-       default n
-       ---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.
-
-         This driver has an optional plugin, which is distributed as a
-         separate module only (released under GPL). It allows to use higher
-         resolutions and framerates, but cannot be included in the official
-         Linux kernel for performance purposes.
-
-         See <file:Documentation/video4linux/w9968cf.txt> for more info.
-
-         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
@@ -1068,23 +1014,6 @@ config USB_SE401
 
 source "drivers/media/video/sn9c102/Kconfig"
 
-config USB_STV680
-       tristate "USB STV680 (Pencam) Camera support (DEPRECATED)"
-       depends on VIDEO_V4L1
-       default n
-       ---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
-         and for a list of supported cameras.
-
-         To compile this driver as a module, choose M here: the
-         module will be called stv680.
-
 source "drivers/media/video/zc0301/Kconfig"
 
 source "drivers/media/video/pwc/Kconfig"