浏览代码

V4L/DVB (3653h): Move usb v4l docs into Documentation/video4linux

- Move documentation for usb v4l devices from
  Documentation/usb to Documentation/video4linux.
- Removed trailing whitespace.
- Update Kconfig help text links to reflect the new file locations.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky 19 年之前
父节点
当前提交
1864cfb153

+ 0 - 0
Documentation/usb/et61x251.txt → Documentation/video4linux/et61x251.txt


+ 1 - 1
Documentation/usb/ibmcam.txt → Documentation/video4linux/ibmcam.txt

@@ -122,7 +122,7 @@ WHAT YOU NEED:
 - A Linux box with USB support (2.3/2.4; 2.2 w/backport may work)
 - A Linux box with USB support (2.3/2.4; 2.2 w/backport may work)
 
 
 - A Video4Linux compatible frame grabber program such as xawtv.
 - A Video4Linux compatible frame grabber program such as xawtv.
-  
+
 HOW TO COMPILE THE DRIVER:
 HOW TO COMPILE THE DRIVER:
 
 
 You need to compile the driver only if you are a developer
 You need to compile the driver only if you are a developer

+ 5 - 6
Documentation/usb/ov511.txt → Documentation/video4linux/ov511.txt

@@ -9,7 +9,7 @@ INTRODUCTION:
 
 
 This is a driver for the OV511, a USB-only chip used in many "webcam" devices.
 This is a driver for the OV511, a USB-only chip used in many "webcam" devices.
 Any camera using the OV511/OV511+ and the OV6620/OV7610/20/20AE should work.
 Any camera using the OV511/OV511+ and the OV6620/OV7610/20/20AE should work.
-Video capture devices that use the Philips SAA7111A decoder also work. It 
+Video capture devices that use the Philips SAA7111A decoder also work. It
 supports streaming and capture of color or monochrome video via the Video4Linux
 supports streaming and capture of color or monochrome video via the Video4Linux
 API. Most V4L apps are compatible with it. Most resolutions with a width and
 API. Most V4L apps are compatible with it. Most resolutions with a width and
 height that are a multiple of 8 are supported.
 height that are a multiple of 8 are supported.
@@ -52,15 +52,15 @@ from it:
 
 
 	chmod 666 /dev/video
 	chmod 666 /dev/video
 	chmod 666 /dev/video0 (if necessary)
 	chmod 666 /dev/video0 (if necessary)
-	
+
 Now you are ready to run a video app! Both vidcat and xawtv work well for me
 Now you are ready to run a video app! Both vidcat and xawtv work well for me
 at 640x480.
 at 640x480.
-	
+
 [Using vidcat:]
 [Using vidcat:]
 
 
 	vidcat -s 640x480 -p c > test.jpg
 	vidcat -s 640x480 -p c > test.jpg
 	xview test.jpg
 	xview test.jpg
-	
+
 [Using xawtv:]
 [Using xawtv:]
 
 
 From the main xawtv directory:
 From the main xawtv directory:
@@ -70,7 +70,7 @@ From the main xawtv directory:
 	make
 	make
 	make install
 	make install
 
 
-Now you should be able to run xawtv. Right click for the options dialog. 
+Now you should be able to run xawtv. Right click for the options dialog.
 
 
 MODULE PARAMETERS:
 MODULE PARAMETERS:
 
 
@@ -286,4 +286,3 @@ Randy Dunlap, and others. Big thanks to them for their pioneering work on that
 and the USB stack. Thanks to Bret Wallach for getting camera reg IO, ISOC, and
 and the USB stack. Thanks to Bret Wallach for getting camera reg IO, ISOC, and
 image capture working. Thanks to Orion Sky Lawlor, Kevin Moore, and Claudio
 image capture working. Thanks to Orion Sky Lawlor, Kevin Moore, and Claudio
 Matsuoka for their work as well.
 Matsuoka for their work as well.
-

+ 0 - 0
Documentation/usb/se401.txt → Documentation/video4linux/se401.txt


+ 8 - 8
Documentation/usb/sn9c102.txt → Documentation/video4linux/sn9c102.txt

@@ -174,7 +174,7 @@ Module parameters are listed below:
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 Name:           video_nr
 Name:           video_nr
 Type:           short array (min = 0, max = 64)
 Type:           short array (min = 0, max = 64)
-Syntax:         <-1|n[,...]> 
+Syntax:         <-1|n[,...]>
 Description:    Specify V4L2 minor mode number:
 Description:    Specify V4L2 minor mode number:
                 -1 = use next available
                 -1 = use next available
                  n = use minor number n
                  n = use minor number n
@@ -187,7 +187,7 @@ Default:        -1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 Name:           force_munmap
 Name:           force_munmap
 Type:           bool array (min = 0, max = 64)
 Type:           bool array (min = 0, max = 64)
-Syntax:         <0|1[,...]> 
+Syntax:         <0|1[,...]>
 Description:    Force the application to unmap previously mapped buffer memory
 Description:    Force the application to unmap previously mapped buffer memory
                 before calling any VIDIOC_S_CROP or VIDIOC_S_FMT ioctl's. Not
                 before calling any VIDIOC_S_CROP or VIDIOC_S_FMT ioctl's. Not
                 all the applications support this feature. This parameter is
                 all the applications support this feature. This parameter is
@@ -206,7 +206,7 @@ Default:        2
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 Name:           debug
 Name:           debug
 Type:           ushort
 Type:           ushort
-Syntax:         <n> 
+Syntax:         <n>
 Description:    Debugging information level, from 0 to 3:
 Description:    Debugging information level, from 0 to 3:
                 0 = none (use carefully)
                 0 = none (use carefully)
                 1 = critical errors
                 1 = critical errors
@@ -267,7 +267,7 @@ The sysfs interface also provides the "frame_header" entry, which exports the
 frame header of the most recent requested and captured video frame. The header
 frame header of the most recent requested and captured video frame. The header
 is always 18-bytes long and is appended to every video frame by the SN9C10x
 is always 18-bytes long and is appended to every video frame by the SN9C10x
 controllers. As an example, this additional information can be used by the user
 controllers. As an example, this additional information can be used by the user
-application for implementing auto-exposure features via software. 
+application for implementing auto-exposure features via software.
 
 
 The following table describes the frame header:
 The following table describes the frame header:
 
 
@@ -441,7 +441,7 @@ blue pixels in one video frame. Each pixel is associated with a 8-bit long
 value and is disposed in memory according to the pattern shown below:
 value and is disposed in memory according to the pattern shown below:
 
 
 B[0]   G[1]    B[2]    G[3]    ...   B[m-2]         G[m-1]
 B[0]   G[1]    B[2]    G[3]    ...   B[m-2]         G[m-1]
-G[m]   R[m+1]  G[m+2]  R[m+2]  ...   G[2m-2]        R[2m-1] 
+G[m]   R[m+1]  G[m+2]  R[m+2]  ...   G[2m-2]        R[2m-1]
 ...
 ...
 ...                                  B[(n-1)(m-2)]  G[(n-1)(m-1)]
 ...                                  B[(n-1)(m-2)]  G[(n-1)(m-1)]
 ...                                  G[n(m-2)]      R[n(m-1)]
 ...                                  G[n(m-2)]      R[n(m-1)]
@@ -472,12 +472,12 @@ The pixel reference value is calculated as follows:
 The algorithm purely describes the conversion from compressed Bayer code used
 The algorithm purely describes the conversion from compressed Bayer code used
 in the SN9C10x chips to uncompressed Bayer. Additional steps are required to
 in the SN9C10x chips to uncompressed Bayer. Additional steps are required to
 convert this to a color image (i.e. a color interpolation algorithm).
 convert this to a color image (i.e. a color interpolation algorithm).
- 
+
 The following Huffman codes have been found:
 The following Huffman codes have been found:
-0: +0 (relative to reference pixel value) 
+0: +0 (relative to reference pixel value)
 100: +4
 100: +4
 101: -4?
 101: -4?
-1110xxxx: set absolute value to xxxx.0000 
+1110xxxx: set absolute value to xxxx.0000
 1101: +11
 1101: +11
 1111: -11
 1111: -11
 11001: +20
 11001: +20

+ 12 - 14
Documentation/usb/stv680.txt → Documentation/video4linux/stv680.txt

@@ -5,15 +5,15 @@ Copyright, 2001, Kevin Sisson
 
 
 INTRODUCTION:
 INTRODUCTION:
 
 
-STMicroelectronics produces the STV0680B chip, which comes in two 
-types, -001 and -003. The -003 version allows the recording and downloading 
-of sound clips from the camera, and allows a flash attachment. Otherwise, 
-it uses the same commands as the -001 version. Both versions support a 
-variety of SDRAM sizes and sensors, allowing for a maximum of 26 VGA or 20 
-CIF pictures. The STV0680 supports either a serial or a usb interface, and 
+STMicroelectronics produces the STV0680B chip, which comes in two
+types, -001 and -003. The -003 version allows the recording and downloading
+of sound clips from the camera, and allows a flash attachment. Otherwise,
+it uses the same commands as the -001 version. Both versions support a
+variety of SDRAM sizes and sensors, allowing for a maximum of 26 VGA or 20
+CIF pictures. The STV0680 supports either a serial or a usb interface, and
 video is possible through the usb interface.
 video is possible through the usb interface.
 
 
-The following cameras are known to work with this driver, although any 
+The following cameras are known to work with this driver, although any
 camera with Vendor/Product codes of 0553/0202 should work:
 camera with Vendor/Product codes of 0553/0202 should work:
 
 
 Aiptek Pencam (various models)
 Aiptek Pencam (various models)
@@ -34,15 +34,15 @@ http://www.linux-usb.org
 MODULE OPTIONS:
 MODULE OPTIONS:
 
 
 When the driver is compiled as a module, you can set a "swapRGB=1"
 When the driver is compiled as a module, you can set a "swapRGB=1"
-option, if necessary, for those applications that require it 
-(such as xawtv). However, the driver should detect and set this 
+option, if necessary, for those applications that require it
+(such as xawtv). However, the driver should detect and set this
 automatically, so this option should not normally be used.
 automatically, so this option should not normally be used.
 
 
 
 
 KNOWN PROBLEMS:
 KNOWN PROBLEMS:
 
 
-The driver seems to work better with the usb-ohci than the usb-uhci host 
-controller driver. 
+The driver seems to work better with the usb-ohci than the usb-uhci host
+controller driver.
 
 
 HELP:
 HELP:
 
 
@@ -50,6 +50,4 @@ The latest info on this driver can be found at:
 http://personal.clt.bellsouth.net/~kjsisson or at
 http://personal.clt.bellsouth.net/~kjsisson or at
 http://stv0680-usb.sourceforge.net
 http://stv0680-usb.sourceforge.net
 
 
-Any questions to me can be send to:  kjsisson@bellsouth.net
-
-
+Any questions to me can be send to:  kjsisson@bellsouth.net

+ 18 - 18
Documentation/usb/w9968cf.txt → Documentation/video4linux/w9968cf.txt

@@ -1,5 +1,5 @@
 
 
-                   W996[87]CF JPEG USB Dual Mode Camera Chip 
+                   W996[87]CF JPEG USB Dual Mode Camera Chip
                      Driver for Linux 2.6 (basic version)
                      Driver for Linux 2.6 (basic version)
                    =========================================
                    =========================================
 
 
@@ -115,7 +115,7 @@ additional testing and full support, would be much appreciated.
 ======================
 ======================
 For it to work properly, the driver needs kernel support for Video4Linux, USB
 For it to work properly, the driver needs kernel support for Video4Linux, USB
 and I2C, and the "ovcamchip" module for the image sensor. Make sure you are not
 and I2C, and the "ovcamchip" module for the image sensor. Make sure you are not
-actually using any external "ovcamchip" module, given that the W996[87]CF 
+actually using any external "ovcamchip" module, given that the W996[87]CF
 driver depends on the version of the module present in the official kernels.
 driver depends on the version of the module present in the official kernels.
 
 
 The following options of the kernel configuration file must be enabled and
 The following options of the kernel configuration file must be enabled and
@@ -197,16 +197,16 @@ Note:            The kernel must be compiled with the CONFIG_KMOD option
                  enabled for the 'ovcamchip' module to be loaded and for
                  enabled for the 'ovcamchip' module to be loaded and for
                  this parameter to be present.
                  this parameter to be present.
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
-Name:           simcams 
-Type:           int 
-Syntax:         <n> 
+Name:           simcams
+Type:           int
+Syntax:         <n>
 Description:    Number of cameras allowed to stream simultaneously.
 Description:    Number of cameras allowed to stream simultaneously.
                 n may vary from 0 to 32.
                 n may vary from 0 to 32.
 Default:        32
 Default:        32
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 Name:           video_nr
 Name:           video_nr
 Type:           int array (min = 0, max = 32)
 Type:           int array (min = 0, max = 32)
-Syntax:         <-1|n[,...]> 
+Syntax:         <-1|n[,...]>
 Description:    Specify V4L minor mode number.
 Description:    Specify V4L minor mode number.
                 -1 = use next available
                 -1 = use next available
                  n = use minor number n
                  n = use minor number n
@@ -219,7 +219,7 @@ Default:        -1
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 Name:           packet_size
 Name:           packet_size
 Type:           int array (min = 0, max = 32)
 Type:           int array (min = 0, max = 32)
-Syntax:         <n[,...]> 
+Syntax:         <n[,...]>
 Description:    Specify the maximum data payload size in bytes for alternate
 Description:    Specify the maximum data payload size in bytes for alternate
                 settings, for each device. n is scaled between 63 and 1023.
                 settings, for each device. n is scaled between 63 and 1023.
 Default:        1023
 Default:        1023
@@ -234,7 +234,7 @@ Default:        2
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 Name:           double_buffer
 Name:           double_buffer
 Type:           bool array (min = 0, max = 32)
 Type:           bool array (min = 0, max = 32)
-Syntax:         <0|1[,...]> 
+Syntax:         <0|1[,...]>
 Description:    Hardware double buffering: 0 disabled, 1 enabled.
 Description:    Hardware double buffering: 0 disabled, 1 enabled.
                 It should be enabled if you want smooth video output: if you
                 It should be enabled if you want smooth video output: if you
                 obtain out of sync. video, disable it, or try to
                 obtain out of sync. video, disable it, or try to
@@ -243,13 +243,13 @@ Default:        1 for every device.
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 Name:           clamping
 Name:           clamping
 Type:           bool array (min = 0, max = 32)
 Type:           bool array (min = 0, max = 32)
-Syntax:         <0|1[,...]> 
+Syntax:         <0|1[,...]>
 Description:    Video data clamping: 0 disabled, 1 enabled.
 Description:    Video data clamping: 0 disabled, 1 enabled.
 Default:        0 for every device.
 Default:        0 for every device.
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 Name:           filter_type
 Name:           filter_type
 Type:           int array (min = 0, max = 32)
 Type:           int array (min = 0, max = 32)
-Syntax:         <0|1|2[,...]> 
+Syntax:         <0|1|2[,...]>
 Description:    Video filter type.
 Description:    Video filter type.
                 0 none, 1 (1-2-1) 3-tap filter, 2 (2-3-6-3-2) 5-tap filter.
                 0 none, 1 (1-2-1) 3-tap filter, 2 (2-3-6-3-2) 5-tap filter.
                 The filter is used to reduce noise and aliasing artifacts
                 The filter is used to reduce noise and aliasing artifacts
@@ -258,13 +258,13 @@ Default:        0 for every device.
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 Name:           largeview
 Name:           largeview
 Type:           bool array (min = 0, max = 32)
 Type:           bool array (min = 0, max = 32)
-Syntax:         <0|1[,...]> 
+Syntax:         <0|1[,...]>
 Description:    Large view: 0 disabled, 1 enabled.
 Description:    Large view: 0 disabled, 1 enabled.
 Default:        1 for every device.
 Default:        1 for every device.
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 Name:           upscaling
 Name:           upscaling
 Type:           bool array (min = 0, max = 32)
 Type:           bool array (min = 0, max = 32)
-Syntax:         <0|1[,...]> 
+Syntax:         <0|1[,...]>
 Description:    Software scaling (for non-compressed video only):
 Description:    Software scaling (for non-compressed video only):
                 0 disabled, 1 enabled.
                 0 disabled, 1 enabled.
                 Disable it if you have a slow CPU or you don't have enough
                 Disable it if you have a slow CPU or you don't have enough
@@ -341,8 +341,8 @@ Default:        50 for every device.
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 Name:           bandingfilter
 Name:           bandingfilter
 Type:           bool array (min = 0, max = 32)
 Type:           bool array (min = 0, max = 32)
-Syntax:         <0|1[,...]> 
-Description:    Banding filter to reduce effects of fluorescent 
+Syntax:         <0|1[,...]>
+Description:    Banding filter to reduce effects of fluorescent
                 lighting:
                 lighting:
                 0 disabled, 1 enabled.
                 0 disabled, 1 enabled.
                 This filter tries to reduce the pattern of horizontal
                 This filter tries to reduce the pattern of horizontal
@@ -374,7 +374,7 @@ Default:        0 for every device.
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 Name:           monochrome
 Name:           monochrome
 Type:           bool array (min = 0, max = 32)
 Type:           bool array (min = 0, max = 32)
-Syntax:         <0|1[,...]> 
+Syntax:         <0|1[,...]>
 Description:    The image sensor is monochrome:
 Description:    The image sensor is monochrome:
                 0 = no, 1 = yes
                 0 = no, 1 = yes
 Default:        0 for every device.
 Default:        0 for every device.
@@ -400,19 +400,19 @@ Default:        32768 for every device.
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 Name:           contrast
 Name:           contrast
 Type:           long array (min = 0, max = 32)
 Type:           long array (min = 0, max = 32)
-Syntax:         <n[,...]> 
+Syntax:         <n[,...]>
 Description:    Set picture contrast (0-65535).
 Description:    Set picture contrast (0-65535).
 Default:        50000 for every device.
 Default:        50000 for every device.
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 Name:           whiteness
 Name:           whiteness
 Type:           long array (min = 0, max = 32)
 Type:           long array (min = 0, max = 32)
-Syntax:         <n[,...]> 
+Syntax:         <n[,...]>
 Description:    Set picture whiteness (0-65535).
 Description:    Set picture whiteness (0-65535).
 Default:        32768 for every device.
 Default:        32768 for every device.
 -------------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 Name:           debug
 Name:           debug
 Type:           int
 Type:           int
-Syntax:         <n> 
+Syntax:         <n>
 Description:    Debugging information level, from 0 to 6:
 Description:    Debugging information level, from 0 to 6:
                 0 = none (use carefully)
                 0 = none (use carefully)
                 1 = critical errors
                 1 = critical errors

+ 0 - 0
Documentation/usb/zc0301.txt → Documentation/video4linux/zc0301.txt


+ 7 - 7
drivers/media/video/Kconfig

@@ -437,8 +437,8 @@ config USB_OV511
 	depends on USB && VIDEO_DEV
 	depends on USB && VIDEO_DEV
 	---help---
 	---help---
 	  Say Y here if you want to connect this type of camera to your
 	  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.
+	  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
 	  To compile this driver as a module, choose M here: the
 	  module will be called ov511.
 	  module will be called ov511.
@@ -448,8 +448,8 @@ config USB_SE401
 	depends on USB && VIDEO_DEV
 	depends on USB && VIDEO_DEV
 	---help---
 	---help---
 	  Say Y here if you want to connect this type of camera to your
 	  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.
+	  computer's USB port. See <file:Documentation/video4linux/se401.txt>
+	  for more information and for a list of supported cameras.
 
 
 	  To compile this driver as a module, choose M here: the
 	  To compile this driver as a module, choose M here: the
 	  module will be called se401.
 	  module will be called se401.
@@ -462,8 +462,8 @@ config USB_STV680
 	---help---
 	---help---
 	  Say Y here if you want to connect this type of camera to your
 	  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.
 	  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.
+	  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
 	  To compile this driver as a module, choose M here: the
 	  module will be called stv680.
 	  module will be called stv680.
@@ -481,7 +481,7 @@ config USB_W9968CF
 	  resolutions and framerates, but cannot be included in the official
 	  resolutions and framerates, but cannot be included in the official
 	  Linux kernel for performance purposes.
 	  Linux kernel for performance purposes.
 
 
-	  See <file:Documentation/usb/w9968cf.txt> for more informations.
+	  See <file:Documentation/video4linux/w9968cf.txt> for more info.
 
 
 	  To compile this driver as a module, choose M here: the
 	  To compile this driver as a module, choose M here: the
 	  module will be called w9968cf.
 	  module will be called w9968cf.

+ 1 - 1
drivers/media/video/et61x251/Kconfig

@@ -5,7 +5,7 @@ config USB_ET61X251
 	  Say Y here if you want support for cameras based on Etoms ET61X151
 	  Say Y here if you want support for cameras based on Etoms ET61X151
 	  or ET61X251 PC Camera Controllers.
 	  or ET61X251 PC Camera Controllers.
 
 
-	  See <file:Documentation/usb/et61x251.txt> for more informations.
+	  See <file:Documentation/video4linux/et61x251.txt> for more info.
 
 
 	  This driver uses the Video For Linux API. You must say Y or M to
 	  This driver uses the Video For Linux API. You must say Y or M to
 	  "Video For Linux" to use this driver.
 	  "Video For Linux" to use this driver.

+ 1 - 1
drivers/media/video/sn9c102/Kconfig

@@ -5,7 +5,7 @@ config USB_SN9C102
 	  Say Y here if you want support for cameras based on SONiX SN9C101,
 	  Say Y here if you want support for cameras based on SONiX SN9C101,
 	  SN9C102 or SN9C103 PC Camera Controllers.
 	  SN9C102 or SN9C103 PC Camera Controllers.
 
 
-	  See <file:Documentation/usb/sn9c102.txt> for more informations.
+	  See <file:Documentation/video4linux/sn9c102.txt> for more info.
 
 
 	  To compile this driver as a module, choose M here: the
 	  To compile this driver as a module, choose M here: the
 	  module will be called sn9c102.
 	  module will be called sn9c102.

+ 2 - 3
drivers/media/video/usbvideo/Kconfig

@@ -17,15 +17,14 @@ config USB_IBMCAM
 	select VIDEO_USBVIDEO
 	select VIDEO_USBVIDEO
 	---help---
 	---help---
 	  Say Y here if you want to connect a IBM "C-It" camera, also known as
 	  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>.
+	  "Xirlink PC Camera" to your computer's USB port.
 
 
 	  To compile this driver as a module, choose M here: the
 	  To compile this driver as a module, choose M here: the
 	  module will be called ibmcam.
 	  module will be called ibmcam.
 
 
 	  This camera has several configuration options which
 	  This camera has several configuration options which
 	  can be specified when you load the module. Read
 	  can be specified when you load the module. Read
-	  <file:Documentation/usb/ibmcam.txt> to learn more.
+	  <file:Documentation/video4linux/ibmcam.txt> to learn more.
 
 
 config USB_KONICAWC
 config USB_KONICAWC
 	tristate "USB Konica Webcam support"
 	tristate "USB Konica Webcam support"

+ 1 - 1
drivers/media/video/zc0301/Kconfig

@@ -5,7 +5,7 @@ config USB_ZC0301
 	  Say Y here if you want support for cameras based on the ZC0301
 	  Say Y here if you want support for cameras based on the ZC0301
 	  Image Processor and Control Chip.
 	  Image Processor and Control Chip.
 
 
-	  See <file:Documentation/usb/zc0301.txt> for more informations.
+	  See <file:Documentation/video4linux/zc0301.txt> for more info.
 
 
 	  To compile this driver as a module, choose M here: the
 	  To compile this driver as a module, choose M here: the
 	  module will be called zc0301.
 	  module will be called zc0301.