Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / usbvideo / Kconfig

diff --git a/drivers/media/video/usbvideo/Kconfig b/drivers/media/video/usbvideo/Kconfig
deleted file mode 100644 (file)
index dfa7fc6..0000000
--- a/drivers/media/video/usbvideo/Kconfig
+++ /dev/null
@@ -1,45 +0,0 @@
-config VIDEO_USBVIDEO
-       tristate
-
-config USB_VICAM
-       tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"
-       depends on VIDEO_V4L1 && EXPERIMENTAL
-       select VIDEO_USBVIDEO
-       ---help---
-         Say Y here if you have 3com homeconnect camera (vicam).
-
-         To compile this driver as a module, choose M here: the
-         module will be called vicam.
-
-config USB_IBMCAM
-       tristate "USB IBM (Xirlink) C-it Camera support (DEPRECATED)"
-       depends on VIDEO_V4L1
-       select VIDEO_USBVIDEO
-       ---help---
-         This driver is DEPRECATED please use the gspca xirlink_cit module
-         instead.
-
-         Say Y here if you want to connect a IBM "C-It" camera, also known as
-         "Xirlink PC Camera" to your computer's USB port.
-
-         To compile this driver as a module, choose M here: the
-         module will be called ibmcam.
-
-         This camera has several configuration options which
-         can be specified when you load the module. Read
-         <file:Documentation/video4linux/ibmcam.txt> to learn more.
-
-config USB_KONICAWC
-       tristate "USB Konica Webcam support (DEPRECATED)"
-       depends on VIDEO_V4L1
-       select VIDEO_USBVIDEO
-       ---help---
-         This driver is DEPRECATED (and known to crash) please use the
-         gspca konica module instead.
-
-         Say Y here if you want support for webcams based on a Konica
-         chipset. This is known to work with the Intel YC76 webcam.
-
-         To compile this driver as a module, choose M here: the
-         module will be called konicawc.
-