From 1a5d6d2b1792245bcfd93aa7225f114a27cc45d3 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Wed, 31 Jul 2013 14:59:10 -0700 Subject: docproc: Move printk file location > docproc: kernel/printk.c: No such file or directory So rename the file. Signed-off-by: Joe Perches Noticed-by: kbuild test robot Acked-by: Rob Landley Signed-off-by: Jiri Kosina --- Documentation/DocBook/device-drivers.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/DocBook') diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl index cbfdf5486639..fe397f90a34f 100644 --- a/Documentation/DocBook/device-drivers.tmpl +++ b/Documentation/DocBook/device-drivers.tmpl @@ -84,7 +84,7 @@ X!Iinclude/linux/kobject.h Kernel utility functions !Iinclude/linux/kernel.h -!Ekernel/printk.c +!Ekernel/printk/printk.c !Ekernel/panic.c !Ekernel/sys.c !Ekernel/rcupdate.c -- cgit v1.2.2 From ac20ad14c3bdb9ed2c43ae16fd949ede9c339502 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Tue, 20 Aug 2013 05:53:49 -0700 Subject: doc: Fix typo "is is" in Documentations Fix double words "is is" in Documentations. Signed-off-by: Masanari Iida Acked-by: Rob Landley Signed-off-by: Jiri Kosina --- Documentation/DocBook/media/v4l/vidioc-g-parm.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation/DocBook') diff --git a/Documentation/DocBook/media/v4l/vidioc-g-parm.xml b/Documentation/DocBook/media/v4l/vidioc-g-parm.xml index 9058224d1bbf..f4e28e7d4751 100644 --- a/Documentation/DocBook/media/v4l/vidioc-g-parm.xml +++ b/Documentation/DocBook/media/v4l/vidioc-g-parm.xml @@ -132,7 +132,7 @@ devices. &v4l2-fract; timeperframe - This is is the desired period between + This is the desired period between successive frames captured by the driver, in seconds. The field is intended to skip frames on the driver side, saving I/O bandwidth.Applications store here the desired frame @@ -193,7 +193,7 @@ applications must set the array to zero. &v4l2-fract; timeperframe - This is is the desired period between + This is the desired period between successive frames output by the driver, in seconds. -- cgit v1.2.2