---

yaml
---
r: 25149
b: refs/heads/master
c: 328caac
h: refs/heads/master
i:
  25147: 1ee6be3
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d95b8942eed310759bc866a2a4c0f110578aaa69
+refs/heads/master: 328caac78a69fa60be67002e4e7dfab3da87dc64

trunk/drivers/media/video/Kconfig

@@ -380,11 +380,6 @@ config USB_VICAM
 	---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.
 
@@ -397,12 +392,6 @@ config USB_DSBR
 	  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.
 
@@ -415,9 +404,6 @@ config USB_ET61X251
 
 	  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.
 
@@ -429,12 +415,6 @@ config USB_IBMCAM
 	  "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.
 
@@ -449,12 +429,6 @@ config USB_KONICAWC
 	  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.
 
@@ -466,11 +440,6 @@ config USB_OV511
 	  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.
 
@@ -482,11 +451,6 @@ config USB_SE401
 	  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.
 
@@ -499,9 +463,6 @@ config USB_SN9C102
 
 	  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.
 
@@ -514,17 +475,13 @@ config USB_STV680
 	  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
+	depends on USB && VIDEO_DEV && I2C
+	select 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.
@@ -536,11 +493,6 @@ config USB_W9968CF
 
 	  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.
 
@@ -553,9 +505,6 @@ config USB_ZC0301
 
 	  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.
 
@@ -585,11 +534,6 @@ config USB_PWC
 
 	  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.