From 325efe382f3d18309a5f71d80a276434f4f0014d Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 12 Aug 2008 07:22:33 +0000 Subject: [PATCH] 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 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 cc: mchehab@infradead.org Signed-off-by: Linus Torvalds svn path=/dists/trunk/linux-2.6/; revision=12040 --- ...docbook-fix-v4l-fatal-filename-error.patch | 26 +++++++++++++++++++ debian/patches/series/1~experimental.1 | 1 + 2 files changed, 27 insertions(+) create mode 100644 debian/patches/bugfix/all/docbook-fix-v4l-fatal-filename-error.patch diff --git a/debian/patches/bugfix/all/docbook-fix-v4l-fatal-filename-error.patch b/debian/patches/bugfix/all/docbook-fix-v4l-fatal-filename-error.patch new file mode 100644 index 000000000..48c6b4e0c --- /dev/null +++ b/debian/patches/bugfix/all/docbook-fix-v4l-fatal-filename-error.patch @@ -0,0 +1,26 @@ +commit 3a35c27ac68cea19c252e127ec61099648eb4870 +Author: Randy Dunlap +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 + cc: mchehab@infradead.org + Signed-off-by: Linus Torvalds + +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; + + + Public Functions Provided +-!Edrivers/media/video/videodev.c ++!Edrivers/media/video/v4l2-dev.c + + + diff --git a/debian/patches/series/1~experimental.1 b/debian/patches/series/1~experimental.1 index 4d73e7e80..2b54bc2a7 100644 --- a/debian/patches/series/1~experimental.1 +++ b/debian/patches/series/1~experimental.1 @@ -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