V4L/DVB (3599a): Move drivers/usb/media to drivers/media/video

Because of historic reasons, there are two separate directories with
V4L stuff. Most drivers are located at driver/media/video. However, some
code for USB Webcams were inserted under drivers/usb/media.

This makes difficult for module authors to know were things should be.
Also, makes Kconfig menu confusing for normal users.

This patch moves all V4L content under drivers/usb/media to
drivers/media/video, and fixes Kconfig/Makefile entries.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 230 insertions, 2 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index b3d3b22d3f78..1f8a46b5916e 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -291,8 +291,6 @@ config VIDEO_HEXIUM_GEMINI
 
 source "drivers/media/video/cx88/Kconfig"
 
-source "drivers/media/video/em28xx/Kconfig"
-
 config VIDEO_OVCAMCHIP
         tristate "OmniVision Camera Chip support"
         depends on VIDEO_DEV && I2C
@@ -367,4 +365,234 @@ config VIDEO_SAA7127
           To compile this driver as a module, choose M here: the
           module will be called saa7127
 
+#
+# USB Multimedia device configuration
+#
+
+menu "V4L USB devices"
+        depends on USB && VIDEO_DEV
+
+source "drivers/media/video/em28xx/Kconfig"
+
+config USB_VICAM
+        tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"
+        depends on USB && VIDEO_DEV && EXPERIMENTAL
+        ---help---
+          Say Y here if you have 3com homeconnect camera (vicam).
+
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" (under Multimedia Devices) to use this driver.
+          Information on this API and pointers to "v4l" programs may be found
+          at <file:Documentation/video4linux/API.html>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called vicam.
+
+config USB_DSBR
+        tristate "D-Link USB FM radio support (EXPERIMENTAL)"
+        depends on USB && VIDEO_DEV && EXPERIMENTAL
+        ---help---
+          Say Y here if you want to connect this type of radio to your
+          computer's USB port. Note that the audio is not digital, and
+          you must connect the line out connector to a sound card or a
+          set of speakers.
+
+          This driver uses the Video For Linux API.  You must enable
+          (Y or M in config) Video For Linux (under Character Devices)
+          to use this driver.  Information on this API and pointers to
+          "v4l" programs may be found at
+          <file:Documentation/video4linux/API.html>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called dsbr100.
+
+config USB_ET61X251
+        tristate "USB ET61X[12]51 PC Camera Controller support"
+        depends on USB && VIDEO_DEV
+        ---help---
+          Say Y here if you want support for cameras based on Etoms ET61X151
+          or ET61X251 PC Camera Controllers.
+
+          See <file:Documentation/usb/et61x251.txt> for more informations.
+
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" to use this driver.
+
+          To compile this driver as a module, choose M here: the
+          module will be called et61x251.
+
+config USB_IBMCAM
+        tristate "USB IBM (Xirlink) C-it Camera support"
+        depends on USB && VIDEO_DEV
+        ---help---
+          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.  For more
+          information, read <file:Documentation/usb/ibmcam.txt>.
+
+          This driver uses the Video For Linux API.  You must enable
+          (Y or M in config) Video For Linux (under Character Devices)
+          to use this driver.  Information on this API and pointers to
+          "v4l" programs may be found at
+          <file:Documentation/video4linux/API.html>.
+
+          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/usb/ibmcam.txt> to learn more.
+
+config USB_KONICAWC
+        tristate "USB Konica Webcam support"
+        depends on USB && VIDEO_DEV
+        ---help---
+          Say Y here if you want support for webcams based on a Konica
+          chipset. This is known to work with the Intel YC76 webcam.
+
+          This driver uses the Video For Linux API.  You must enable
+          (Y or M in config) Video For Linux (under Character Devices)
+          to use this driver.  Information on this API and pointers to
+          "v4l" programs may be found at
+          <file:Documentation/video4linux/API.html>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called konicawc.
+
+config USB_OV511
+        tristate "USB OV511 Camera support"
+        depends on USB && VIDEO_DEV
+        ---help---
+          Say Y here if you want to connect this type of camera to your
+          computer's USB port. See <file:Documentation/usb/ov511.txt> for more
+          information and for a list of supported cameras.
+
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" (under Character Devices) to use this driver.
+          Information on this API and pointers to "v4l" programs may be found
+          at <file:Documentation/video4linux/API.html>.
+
+          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 USB && VIDEO_DEV
+        ---help---
+          Say Y here if you want to connect this type of camera to your
+          computer's USB port. See <file:Documentation/usb/se401.txt> for more
+          information and for a list of supported cameras.
+
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" (under Multimedia Devices) to use this driver.
+          Information on this API and pointers to "v4l" programs may be found
+          at <file:Documentation/video4linux/API.html>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called se401.
+
+config USB_SN9C102
+        tristate "USB SN9C10x PC Camera Controller support"
+        depends on USB && VIDEO_DEV
+        ---help---
+          Say Y here if you want support for cameras based on SONiX SN9C101,
+          SN9C102 or SN9C103 PC Camera Controllers.
+
+          See <file:Documentation/usb/sn9c102.txt> for more informations.
+
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" to use this driver.
+
+          To compile this driver as a module, choose M here: the
+          module will be called sn9c102.
+
+config USB_STV680
+        tristate "USB STV680 (Pencam) Camera support"
+        depends on USB && VIDEO_DEV
+        ---help---
+          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/usb/stv680.txt> for more information and for
+          a list of supported cameras.
+
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" (under Multimedia Devices) to use this driver.
+          Information on this API and pointers to "v4l" programs may be found
+          at <file:Documentation/video4linux/API.html>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called stv680.
+
+config USB_W9968CF
+        tristate "USB W996[87]CF JPEG Dual Mode Camera support"
+        depends on USB && VIDEO_DEV && I2C && VIDEO_OVCAMCHIP
+        ---help---
+          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/usb/w9968cf.txt> for more informations.
+
+          This driver uses the Video For Linux and the I2C APIs. It needs the
+          OmniVision Camera Chip support as well. You must say Y or M to
+          "Video For Linux", "I2C Support" and "OmniVision Camera Chip 
+          support" to use this driver.
+
+          To compile this driver as a module, choose M here: the
+          module will be called w9968cf.
+
+config USB_ZC0301
+        tristate "USB ZC0301 Image Processor and Control Chip support"
+        depends on USB && VIDEO_DEV
+        ---help---
+          Say Y here if you want support for cameras based on the ZC0301
+          Image Processor and Control Chip.
+
+          See <file:Documentation/usb/zc0301.txt> for more informations.
+
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" to use this driver.
+
+          To compile this driver as a module, choose M here: the
+          module will be called zc0301.
+
+config USB_PWC
+        tristate "USB Philips Cameras"
+        depends on USB && VIDEO_DEV
+        ---help---
+          Say Y or M here if you want to use one of these Philips & OEM
+          webcams:
+           * Philips PCA645, PCA646
+           * Philips PCVC675, PCVC680, PCVC690
+           * Philips PCVC720/40, PCVC730, PCVC740, PCVC750
+           * Askey VC010
+           * Logitech QuickCam Pro 3000, 4000, 'Zoom', 'Notebook Pro' 
+             and 'Orbit'/'Sphere'
+           * Samsung MPC-C10, MPC-C30
+           * Creative Webcam 5, Pro Ex
+           * SOTEC Afina Eye
+           * Visionite VCS-UC300, VCS-UM100
+           
+          The PCA635, PCVC665 and PCVC720/20 are not supported by this driver
+          and never will be, but the 665 and 720/20 are supported by other 
+          drivers.
+
+          See <file:Documentation/usb/philips.txt> for more information and
+          installation instructions.
+
+          The built-in microphone is enabled by selecting USB Audio support.
+
+          This driver uses the Video For Linux API. You must say Y or M to
+          "Video For Linux" (under Character Devices) to use this driver.
+          Information on this API and pointers to "v4l" programs may be found
+          at <file:Documentation/video4linux/API.html>.
+
+          To compile this driver as a module, choose M here: the
+          module will be called pwc.
+
+endmenu # V4L USB devices
+
 endmenu