Skip to content

Commit 2ebe0bb

Browse files
mchehabmchehab
committed
media: v4l: fix broken video4linux docs locations
There are several places pointing to old documentation files: Documentation/video4linux/API.html Documentation/video4linux/bttv/ Documentation/video4linux/cx2341x/fw-encoder-api.txt Documentation/video4linux/m5602.txt Documentation/video4linux/v4l2-framework.txt Documentation/video4linux/videobuf Documentation/video4linux/Zoran Make them point to the new location where available, removing otherwise. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Acked-by: Jonathan Corbet <corbet@lwn.net>
1 parent 670d7ad commit 2ebe0bb

File tree

7 files changed

+13
-15
lines changed

7 files changed

+13
-15
lines changed

‎Documentation/translations/zh_CN/video4linux/v4l2-framework.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Chinese translated version of Documentation/video4linux/v4l2-framework.txt
1+
Chinese translated version of Documentation/media/media_kapi.rst
22

33
If you have any comment or update to the content, please contact the
44
original document maintainer directly. However, if you have a problem
@@ -9,7 +9,7 @@ or if there is a problem with the translation.
99
Maintainer: Mauro Carvalho Chehab <mchehab@kernel.org>
1010
Chinese maintainer: Fu Wei <tekkamanninja@gmail.com>
1111
---------------------------------------------------------------------
12-
Documentation/video4linux/v4l2-framework.txt 的中文翻译
12+
Documentation/media/media_kapi.rst 的中文翻译
1313

1414
如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文
1515
交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻
@@ -777,7 +777,7 @@ v4l2 核心 API 提供了一个处理视频缓冲的标准方法(称为“videob
777777
线性 DMA(videobuf-dma-contig)以及大多用于 USB 设备的用 vmalloc
778778
分配的缓冲(videobuf-vmalloc)。
779779

780-
请参阅 Documentation/video4linux/videobuf，以获得更多关于 videobuf
780+
请参阅 Documentation/media/kapi/v4l2-videobuf.rst，以获得更多关于 videobuf
781781
层的使用信息。
782782

783783
v4l2_fh 结构体

‎drivers/media/pci/bt8xx/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ config VIDEO_BT848
1616
---help---
1717
Support for BT848 based frame grabber/overlay boards. This includes
1818
the Miro, Hauppauge and STB boards. Please read the material in
19-
<file:Documentation/video4linux/bttv/> for more information.
19+
<file:Documentation/media/v4l-drivers/bttv.rst> for more information.
2020

2121
To compile this driver as a module, choose M here: the
2222
module will be called bttv.

‎drivers/media/pci/cx18/cx18-streams.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -853,15 +853,15 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)
853853

854854
/*
855855
* Audio related reset according to
856-
* Documentation/video4linux/cx2341x/fw-encoder-api.txt
856+
* Documentation/media/v4l-drivers/cx2341x.rst
857857
*/
858858
if (atomic_read(&cx->ana_capturing) == 0)
859859
cx18_vapi(cx, CX18_CPU_SET_MISC_PARAMETERS, 2,
860860
s->handle, 12);
861861

862862
/*
863863
* Number of lines for Field 1 & Field 2 according to
864-
* Documentation/video4linux/cx2341x/fw-encoder-api.txt
864+
* Documentation/media/v4l-drivers/cx2341x.rst
865865
* Field 1 is 312 for 625 line systems in BT.656
866866
* Field 2 is 313 for 625 line systems in BT.656
867867
*/

‎drivers/media/radio/Kconfig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ config RADIO_SI476X
3535
In order to control your radio card, you will need to use programs
3636
that are compatible with the Video For Linux 2 API. Information on
3737
this API and pointers to "v4l2" programs may be found at
38-
<file:Documentation/video4linux/API.html>.
38+
<file:Documentation/media/media_uapi.rst>.
3939

4040
To compile this driver as a module, choose M here: the
4141
module will be called radio-si476x.
@@ -75,7 +75,7 @@ config RADIO_MAXIRADIO
7575
In order to control your radio card, you will need to use programs
7676
that are compatible with the Video For Linux API. Information on
7777
this API and pointers to "v4l" programs may be found at
78-
<file:Documentation/video4linux/API.html>.
78+
<file:Documentation/media/media_uapi.rst>.
7979

8080
To compile this driver as a module, choose M here: the
8181
module will be called radio-maxiradio.
@@ -93,7 +93,7 @@ config RADIO_SHARK
9393
In order to control your radio card, you will need to use programs
9494
that are compatible with the Video For Linux API. Information on
9595
this API and pointers to "v4l" programs may be found at
96-
<file:Documentation/video4linux/API.html>.
96+
<file:Documentation/media/media_uapi.rst>.
9797

9898
To compile this driver as a module, choose M here: the
9999
module will be called radio-shark.
@@ -110,7 +110,7 @@ config RADIO_SHARK2
110110
In order to control your radio card, you will need to use programs
111111
that are compatible with the Video For Linux API. Information on
112112
this API and pointers to "v4l" programs may be found at
113-
<file:Documentation/video4linux/API.html>.
113+
<file:Documentation/media/media_uapi.rst>.
114114

115115
To compile this driver as a module, choose M here: the
116116
module will be called radio-shark2.
@@ -217,7 +217,7 @@ config RADIO_WL1273
217217
In order to control your radio card, you will need to use programs
218218
that are compatible with the Video For Linux 2 API. Information on
219219
this API and pointers to "v4l2" programs may be found at
220-
<file:Documentation/video4linux/API.html>.
220+
<file:Documentation/media/media_uapi.rst>.
221221

222222
To compile this driver as a module, choose M here: the
223223
module will be called radio-wl1273.

‎drivers/media/radio/wl128x/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ config RADIO_WL128X
1212
In order to control your radio card, you will need to use programs
1313
that are compatible with the Video For Linux 2 API. Information on
1414
this API and pointers to "v4l2" programs may be found at
15-
<file:Documentation/video4linux/API.html>.
15+
<file:Documentation/media/media_uapi.rst>.
1616

1717
endmenu

‎drivers/media/usb/gspca/m5602/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,5 @@ config USB_M5602
55
Say Y here if you want support for cameras based on the
66
ALi m5602 connected to various image sensors.
77

8-
See <file:Documentation/video4linux/m5602.txt> for more info.
9-
108
To compile this driver as a module, choose M here: the
119
module will be called gspca_m5602.

‎drivers/staging/media/zoran/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ config VIDEO_ZORAN
77
36057/36067 PCI controller chipset. This includes the Iomega
88
Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is
99
a driver homepage at <http://mjpeg.sf.net/driver-zoran/>. For
10-
more information, check <file:Documentation/video4linux/Zoran>.
10+
more information, check <file:Documentation/media/v4l-drivers/zoran.rst>.
1111

1212
To compile this driver as a module, choose M here: the
1313
module will be called zr36067.

0 commit comments

Comments
 (0)