[kernel] r12040 - in dists/trunk/linux-2.6/debian/patches: bugfix/all series

[Ian Campbell]

Author: ijc-guest
Date: Tue Aug 12 07:22:33 2008
New Revision: 12040

Log:
Fix upstream build breakage in Documentation/DocBook/videobook.xml

  DOCPROC Documentation/DocBook/videobook.xml
  docproc: /tmp/buildd/linux-2.6-2.6.27~rc2/debian/build/source/drivers/media/video/videodev.c: No such file or directory
  make[5]: *** [Documentation/DocBook/videobook.xml] Error 1

Fixed by importing upstream changeset:
  commit 3a35c27ac68cea19c252e127ec61099648eb4870
  Author: Randy Dunlap <randy.dunlap at oracle.com>
  Date:   Wed Aug 6 10:08:56 2008 -0700

      docbook: fix v4l fatal filename error

      docproc: /var/linsrc/lin2627-rc2/drivers/media/video/videodev.c: No such file or directory
      make[1]: *** [Documentation/DocBook/videobook.xml] Error 1

      Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
      cc: mchehab at infradead.org
      Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/docbook-fix-v4l-fatal-filename-error.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/docbook-fix-v4l-fatal-filename-error.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/docbook-fix-v4l-fatal-filename-error.patch	Tue Aug 12 07:22:33 2008
@@ -0,0 +1,26 @@
+commit 3a35c27ac68cea19c252e127ec61099648eb4870
+Author: Randy Dunlap <randy.dunlap at oracle.com>
+Date:   Wed Aug 6 10:08:56 2008 -0700
+
+    docbook: fix v4l fatal filename error
+    
+    docproc: /var/linsrc/lin2627-rc2/drivers/media/video/videodev.c: No such file or directory
+    make[1]: *** [Documentation/DocBook/videobook.xml] Error 1
+    
+    Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
+    cc: mchehab at infradead.org
+    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+
+diff --git a/Documentation/DocBook/videobook.tmpl b/Documentation/DocBook/videobook.tmpl
+index 8981779..0bc2594 100644
+--- a/Documentation/DocBook/videobook.tmpl
++++ b/Documentation/DocBook/videobook.tmpl
+@@ -1648,7 +1648,7 @@ static struct video_buffer capture_fb;
+ 
+   <chapter id="pubfunctions">
+      <title>Public Functions Provided</title>
+-!Edrivers/media/video/videodev.c
++!Edrivers/media/video/v4l2-dev.c
+   </chapter>
+ 
+ </book>

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Tue Aug 12 07:22:33 2008
@@ -40,3 +40,4 @@
 + bugfix/all/mtd-prevent-physmap-from-causing-request_module-runaway-loop-modprobe-net-pf-1.patch
 + bugfix/powerpc/mm-mol.patch
 #+ bugfix/powerpc/lpar-console.patch
++ bugfix/all/docbook-fix-v4l-fatal-filename-error.patch