115 files changed, 16 insertions, 4 deletions
diff --git a/staging-specs/dvb/audio.xml b/linux/Documentation/DocBook/dvb/audio.xml
index eeb96b8a0..eeb96b8a0 100644
--- a/staging-specs/dvb/audio.xml
+++ b/linux/Documentation/DocBook/dvb/audio.xml
diff --git a/staging-specs/dvb/ca.xml b/linux/Documentation/DocBook/dvb/ca.xml
index b1f1d2fad..b1f1d2fad 100644
--- a/staging-specs/dvb/ca.xml
+++ b/linux/Documentation/DocBook/dvb/ca.xml
diff --git a/staging-specs/dvb/demux.xml b/linux/Documentation/DocBook/dvb/demux.xml
index 1b8c4e983..1b8c4e983 100644
--- a/staging-specs/dvb/demux.xml
+++ b/linux/Documentation/DocBook/dvb/demux.xml
diff --git a/staging-specs/dvb/dvbapi.xml b/linux/Documentation/DocBook/dvb/dvbapi.xml
index d53ca4e98..d53ca4e98 100644
--- a/staging-specs/dvb/dvbapi.xml
+++ b/linux/Documentation/DocBook/dvb/dvbapi.xml
diff --git a/staging-specs/dvb/dvbstb.pdf b/linux/Documentation/DocBook/dvb/dvbstb.pdf
index 0fa75d90c..0fa75d90c 100644
--- a/staging-specs/dvb/dvbstb.pdf
+++ b/linux/Documentation/DocBook/dvb/dvbstb.pdf
diff --git a/staging-specs/dvb/dvbstb.png b/linux/Documentation/DocBook/dvb/dvbstb.png
index 9b8f372e7..9b8f372e7 100644
--- a/staging-specs/dvb/dvbstb.png
+++ b/linux/Documentation/DocBook/dvb/dvbstb.png
diff --git a/staging-specs/dvb/examples.xml b/linux/Documentation/DocBook/dvb/examples.xml
index b89dceda6..b89dceda6 100644
--- a/staging-specs/dvb/examples.xml
+++ b/linux/Documentation/DocBook/dvb/examples.xml
diff --git a/staging-specs/dvb/frontend.xml b/linux/Documentation/DocBook/dvb/frontend.xml
index 91a749f70..91a749f70 100644
--- a/staging-specs/dvb/frontend.xml
+++ b/linux/Documentation/DocBook/dvb/frontend.xml
diff --git a/staging-specs/dvb/intro.xml b/linux/Documentation/DocBook/dvb/intro.xml
index 83676c44e..83676c44e 100644
--- a/staging-specs/dvb/intro.xml
+++ b/linux/Documentation/DocBook/dvb/intro.xml
diff --git a/staging-specs/dvb/kdapi.xml b/linux/Documentation/DocBook/dvb/kdapi.xml
index 6c67481ea..6c67481ea 100644
--- a/staging-specs/dvb/kdapi.xml
+++ b/linux/Documentation/DocBook/dvb/kdapi.xml
diff --git a/staging-specs/dvb/net.xml b/linux/Documentation/DocBook/dvb/net.xml
index 94e388d94..94e388d94 100644
--- a/staging-specs/dvb/net.xml
+++ b/linux/Documentation/DocBook/dvb/net.xml
diff --git a/staging-specs/dvb/video.xml b/linux/Documentation/DocBook/dvb/video.xml
index 7bb287e67..7bb287e67 100644
--- a/staging-specs/dvb/video.xml
+++ b/linux/Documentation/DocBook/dvb/video.xml
diff --git a/staging-specs/media.xml b/linux/Documentation/DocBook/media.xml
index 14302589d..14302589d 100644
--- a/staging-specs/media.xml
+++ b/linux/Documentation/DocBook/media.xml
diff --git a/staging-specs/v4l/biblio.xml b/linux/Documentation/DocBook/v4l/biblio.xml
index afc8a0dd2..afc8a0dd2 100644
--- a/staging-specs/v4l/biblio.xml
+++ b/linux/Documentation/DocBook/v4l/biblio.xml
diff --git a/staging-specs/v4l/common.xml b/linux/Documentation/DocBook/v4l/common.xml
index dd598ac9a..dd598ac9a 100644
--- a/staging-specs/v4l/common.xml
+++ b/linux/Documentation/DocBook/v4l/common.xml
diff --git a/staging-specs/v4l/compat.xml b/linux/Documentation/DocBook/v4l/compat.xml
index 4d1902a54..4d1902a54 100644
--- a/staging-specs/v4l/compat.xml
+++ b/linux/Documentation/DocBook/v4l/compat.xml
diff --git a/staging-specs/v4l/controls.xml b/linux/Documentation/DocBook/v4l/controls.xml
index f492accb6..f492accb6 100644
--- a/staging-specs/v4l/controls.xml
+++ b/linux/Documentation/DocBook/v4l/controls.xml
diff --git a/staging-specs/v4l/crop.gif b/linux/Documentation/DocBook/v4l/crop.gif
index 3b9e7d836..3b9e7d836 100644
--- a/staging-specs/v4l/crop.gif
+++ b/linux/Documentation/DocBook/v4l/crop.gif
diff --git a/staging-specs/v4l/crop.pdf b/linux/Documentation/DocBook/v4l/crop.pdf
index c9fb81cd3..c9fb81cd3 100644
--- a/staging-specs/v4l/crop.pdf
+++ b/linux/Documentation/DocBook/v4l/crop.pdf
diff --git a/staging-specs/v4l/dev-capture.xml b/linux/Documentation/DocBook/v4l/dev-capture.xml
index 32807e43f..32807e43f 100644
--- a/staging-specs/v4l/dev-capture.xml
+++ b/linux/Documentation/DocBook/v4l/dev-capture.xml
diff --git a/staging-specs/v4l/dev-codec.xml b/linux/Documentation/DocBook/v4l/dev-codec.xml
index 6e156dc45..6e156dc45 100644
--- a/staging-specs/v4l/dev-codec.xml
+++ b/linux/Documentation/DocBook/v4l/dev-codec.xml
diff --git a/staging-specs/v4l/dev-effect.xml b/linux/Documentation/DocBook/v4l/dev-effect.xml
index 9c243beba..9c243beba 100644
--- a/staging-specs/v4l/dev-effect.xml
+++ b/linux/Documentation/DocBook/v4l/dev-effect.xml
diff --git a/staging-specs/v4l/dev-osd.xml b/linux/Documentation/DocBook/v4l/dev-osd.xml
index c9a68a2cc..c9a68a2cc 100644
--- a/staging-specs/v4l/dev-osd.xml
+++ b/linux/Documentation/DocBook/v4l/dev-osd.xml
diff --git a/staging-specs/v4l/dev-output.xml b/linux/Documentation/DocBook/v4l/dev-output.xml
index 63c3c20e5..63c3c20e5 100644
--- a/staging-specs/v4l/dev-output.xml
+++ b/linux/Documentation/DocBook/v4l/dev-output.xml
diff --git a/staging-specs/v4l/dev-overlay.xml b/linux/Documentation/DocBook/v4l/dev-overlay.xml
index 92513cf79..92513cf79 100644
--- a/staging-specs/v4l/dev-overlay.xml
+++ b/linux/Documentation/DocBook/v4l/dev-overlay.xml
diff --git a/staging-specs/v4l/dev-radio.xml b/linux/Documentation/DocBook/v4l/dev-radio.xml
index 73aa90b45..73aa90b45 100644
--- a/staging-specs/v4l/dev-radio.xml
+++ b/linux/Documentation/DocBook/v4l/dev-radio.xml
diff --git a/staging-specs/v4l/dev-raw-vbi.xml b/linux/Documentation/DocBook/v4l/dev-raw-vbi.xml
index c5a70bdfa..c5a70bdfa 100644
--- a/staging-specs/v4l/dev-raw-vbi.xml
+++ b/linux/Documentation/DocBook/v4l/dev-raw-vbi.xml
diff --git a/staging-specs/v4l/dev-rds.xml b/linux/Documentation/DocBook/v4l/dev-rds.xml
index 0869d701b..0869d701b 100644
--- a/staging-specs/v4l/dev-rds.xml
+++ b/linux/Documentation/DocBook/v4l/dev-rds.xml
diff --git a/staging-specs/v4l/dev-sliced-vbi.xml b/linux/Documentation/DocBook/v4l/dev-sliced-vbi.xml
index 69e789fa7..69e789fa7 100644
--- a/staging-specs/v4l/dev-sliced-vbi.xml
+++ b/linux/Documentation/DocBook/v4l/dev-sliced-vbi.xml
diff --git a/staging-specs/v4l/dev-teletext.xml b/linux/Documentation/DocBook/v4l/dev-teletext.xml
index 59f9993e1..59f9993e1 100644
--- a/staging-specs/v4l/dev-teletext.xml
+++ b/linux/Documentation/DocBook/v4l/dev-teletext.xml
diff --git a/staging-specs/v4l/driver.xml b/linux/Documentation/DocBook/v4l/driver.xml
index 1f7eea5c4..1f7eea5c4 100644
--- a/staging-specs/v4l/driver.xml
+++ b/linux/Documentation/DocBook/v4l/driver.xml
diff --git a/staging-specs/v4l/fdl-appendix.xml b/linux/Documentation/DocBook/v4l/fdl-appendix.xml
index b6ce50dbe..b6ce50dbe 100644
--- a/staging-specs/v4l/fdl-appendix.xml
+++ b/linux/Documentation/DocBook/v4l/fdl-appendix.xml
diff --git a/staging-specs/v4l/fieldseq_bt.gif b/linux/Documentation/DocBook/v4l/fieldseq_bt.gif
index 60e8569a7..60e8569a7 100644
--- a/staging-specs/v4l/fieldseq_bt.gif
+++ b/linux/Documentation/DocBook/v4l/fieldseq_bt.gif
diff --git a/staging-specs/v4l/fieldseq_bt.pdf b/linux/Documentation/DocBook/v4l/fieldseq_bt.pdf
index 26598b23f..26598b23f 100644
--- a/staging-specs/v4l/fieldseq_bt.pdf
+++ b/linux/Documentation/DocBook/v4l/fieldseq_bt.pdf
diff --git a/staging-specs/v4l/fieldseq_tb.gif b/linux/Documentation/DocBook/v4l/fieldseq_tb.gif
index 718492f1c..718492f1c 100644
--- a/staging-specs/v4l/fieldseq_tb.gif
+++ b/linux/Documentation/DocBook/v4l/fieldseq_tb.gif
diff --git a/staging-specs/v4l/fieldseq_tb.pdf b/linux/Documentation/DocBook/v4l/fieldseq_tb.pdf
index 4965b22dd..4965b22dd 100644
--- a/staging-specs/v4l/fieldseq_tb.pdf
+++ b/linux/Documentation/DocBook/v4l/fieldseq_tb.pdf
diff --git a/staging-specs/v4l/func-close.xml b/linux/Documentation/DocBook/v4l/func-close.xml
index dfb41cbbb..dfb41cbbb 100644
--- a/staging-specs/v4l/func-close.xml
+++ b/linux/Documentation/DocBook/v4l/func-close.xml
diff --git a/staging-specs/v4l/func-ioctl.xml b/linux/Documentation/DocBook/v4l/func-ioctl.xml
index 00f9690e1..00f9690e1 100644
--- a/staging-specs/v4l/func-ioctl.xml
+++ b/linux/Documentation/DocBook/v4l/func-ioctl.xml
diff --git a/staging-specs/v4l/func-mmap.xml b/linux/Documentation/DocBook/v4l/func-mmap.xml
index 2e2fc3933..2e2fc3933 100644
--- a/staging-specs/v4l/func-mmap.xml
+++ b/linux/Documentation/DocBook/v4l/func-mmap.xml
diff --git a/staging-specs/v4l/func-munmap.xml b/linux/Documentation/DocBook/v4l/func-munmap.xml
index 502ed4932..502ed4932 100644
--- a/staging-specs/v4l/func-munmap.xml
+++ b/linux/Documentation/DocBook/v4l/func-munmap.xml
diff --git a/staging-specs/v4l/func-open.xml b/linux/Documentation/DocBook/v4l/func-open.xml
index 7595d07a8..7595d07a8 100644
--- a/staging-specs/v4l/func-open.xml
+++ b/linux/Documentation/DocBook/v4l/func-open.xml
diff --git a/staging-specs/v4l/func-poll.xml b/linux/Documentation/DocBook/v4l/func-poll.xml
index ec3c718f5..ec3c718f5 100644
--- a/staging-specs/v4l/func-poll.xml
+++ b/linux/Documentation/DocBook/v4l/func-poll.xml
diff --git a/staging-specs/v4l/func-read.xml b/linux/Documentation/DocBook/v4l/func-read.xml
index a5089bf88..a5089bf88 100644
--- a/staging-specs/v4l/func-read.xml
+++ b/linux/Documentation/DocBook/v4l/func-read.xml
diff --git a/staging-specs/v4l/func-select.xml b/linux/Documentation/DocBook/v4l/func-select.xml
index b67136231..b67136231 100644
--- a/staging-specs/v4l/func-select.xml
+++ b/linux/Documentation/DocBook/v4l/func-select.xml
diff --git a/staging-specs/v4l/func-write.xml b/linux/Documentation/DocBook/v4l/func-write.xml
index 2c09c0937..2c09c0937 100644
--- a/staging-specs/v4l/func-write.xml
+++ b/linux/Documentation/DocBook/v4l/func-write.xml
diff --git a/staging-specs/v4l/io.xml b/linux/Documentation/DocBook/v4l/io.xml
index f92f24323..f92f24323 100644
--- a/staging-specs/v4l/io.xml
+++ b/linux/Documentation/DocBook/v4l/io.xml
diff --git a/staging-specs/v4l/libv4l.xml b/linux/Documentation/DocBook/v4l/libv4l.xml
index c14fc3db2..c14fc3db2 100644
--- a/staging-specs/v4l/libv4l.xml
+++ b/linux/Documentation/DocBook/v4l/libv4l.xml
diff --git a/staging-specs/v4l/pixfmt-grey.xml b/linux/Documentation/DocBook/v4l/pixfmt-grey.xml
index 3b72bc6b2..3b72bc6b2 100644
--- a/staging-specs/v4l/pixfmt-grey.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-grey.xml
diff --git a/staging-specs/v4l/pixfmt-nv12.xml b/linux/Documentation/DocBook/v4l/pixfmt-nv12.xml
index 873f67035..873f67035 100644
--- a/staging-specs/v4l/pixfmt-nv12.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-nv12.xml
diff --git a/staging-specs/v4l/pixfmt-nv16.xml b/linux/Documentation/DocBook/v4l/pixfmt-nv16.xml
index 26094035f..26094035f 100644
--- a/staging-specs/v4l/pixfmt-nv16.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-nv16.xml
diff --git a/staging-specs/v4l/pixfmt-packed-rgb.xml b/linux/Documentation/DocBook/v4l/pixfmt-packed-rgb.xml
index d2dd697a8..d2dd697a8 100644
--- a/staging-specs/v4l/pixfmt-packed-rgb.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-packed-rgb.xml
diff --git a/staging-specs/v4l/pixfmt-packed-yuv.xml b/linux/Documentation/DocBook/v4l/pixfmt-packed-yuv.xml
index 3cab5d0ca..3cab5d0ca 100644
--- a/staging-specs/v4l/pixfmt-packed-yuv.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-packed-yuv.xml
diff --git a/staging-specs/v4l/pixfmt-sbggr16.xml b/linux/Documentation/DocBook/v4l/pixfmt-sbggr16.xml
index 519a9efba..519a9efba 100644
--- a/staging-specs/v4l/pixfmt-sbggr16.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-sbggr16.xml
diff --git a/staging-specs/v4l/pixfmt-sbggr8.xml b/linux/Documentation/DocBook/v4l/pixfmt-sbggr8.xml
index 5fe84ecc2..5fe84ecc2 100644
--- a/staging-specs/v4l/pixfmt-sbggr8.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-sbggr8.xml
diff --git a/staging-specs/v4l/pixfmt-sgbrg8.xml b/linux/Documentation/DocBook/v4l/pixfmt-sgbrg8.xml
index d67a472b0..d67a472b0 100644
--- a/staging-specs/v4l/pixfmt-sgbrg8.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-sgbrg8.xml
diff --git a/staging-specs/v4l/pixfmt-sgrbg8.xml b/linux/Documentation/DocBook/v4l/pixfmt-sgrbg8.xml
index 0cdf13b8a..0cdf13b8a 100644
--- a/staging-specs/v4l/pixfmt-sgrbg8.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-sgrbg8.xml
diff --git a/staging-specs/v4l/pixfmt-uyvy.xml b/linux/Documentation/DocBook/v4l/pixfmt-uyvy.xml
index 816c8d467..816c8d467 100644
--- a/staging-specs/v4l/pixfmt-uyvy.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-uyvy.xml
diff --git a/staging-specs/v4l/pixfmt-vyuy.xml b/linux/Documentation/DocBook/v4l/pixfmt-vyuy.xml
index 61f12a5e6..61f12a5e6 100644
--- a/staging-specs/v4l/pixfmt-vyuy.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-vyuy.xml
diff --git a/staging-specs/v4l/pixfmt-y16.xml b/linux/Documentation/DocBook/v4l/pixfmt-y16.xml
index d58404015..d58404015 100644
--- a/staging-specs/v4l/pixfmt-y16.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-y16.xml
diff --git a/staging-specs/v4l/pixfmt-y41p.xml b/linux/Documentation/DocBook/v4l/pixfmt-y41p.xml
index 73c8536ef..73c8536ef 100644
--- a/staging-specs/v4l/pixfmt-y41p.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-y41p.xml
diff --git a/staging-specs/v4l/pixfmt-yuv410.xml b/linux/Documentation/DocBook/v4l/pixfmt-yuv410.xml
index 8eb4a193d..8eb4a193d 100644
--- a/staging-specs/v4l/pixfmt-yuv410.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-yuv410.xml
diff --git a/staging-specs/v4l/pixfmt-yuv411p.xml b/linux/Documentation/DocBook/v4l/pixfmt-yuv411p.xml
index 00e0960a9..00e0960a9 100644
--- a/staging-specs/v4l/pixfmt-yuv411p.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-yuv411p.xml
diff --git a/staging-specs/v4l/pixfmt-yuv420.xml b/linux/Documentation/DocBook/v4l/pixfmt-yuv420.xml
index 42d7de5e4..42d7de5e4 100644
--- a/staging-specs/v4l/pixfmt-yuv420.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-yuv420.xml
diff --git a/staging-specs/v4l/pixfmt-yuv422p.xml b/linux/Documentation/DocBook/v4l/pixfmt-yuv422p.xml
index 4348bd9f0..4348bd9f0 100644
--- a/staging-specs/v4l/pixfmt-yuv422p.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-yuv422p.xml
diff --git a/staging-specs/v4l/pixfmt-yuyv.xml b/linux/Documentation/DocBook/v4l/pixfmt-yuyv.xml
index bdb2ffacb..bdb2ffacb 100644
--- a/staging-specs/v4l/pixfmt-yuyv.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-yuyv.xml
diff --git a/staging-specs/v4l/pixfmt-yvyu.xml b/linux/Documentation/DocBook/v4l/pixfmt-yvyu.xml
index 40d17ae39..40d17ae39 100644
--- a/staging-specs/v4l/pixfmt-yvyu.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt-yvyu.xml
diff --git a/staging-specs/v4l/pixfmt.xml b/linux/Documentation/DocBook/v4l/pixfmt.xml
index aaea55d44..aaea55d44 100644
--- a/staging-specs/v4l/pixfmt.xml
+++ b/linux/Documentation/DocBook/v4l/pixfmt.xml
diff --git a/staging-specs/v4l/remote_controllers.xml b/linux/Documentation/DocBook/v4l/remote_controllers.xml
index eb669537a..eb669537a 100644
--- a/staging-specs/v4l/remote_controllers.xml
+++ b/linux/Documentation/DocBook/v4l/remote_controllers.xml
diff --git a/staging-specs/v4l/v4l2.xml b/linux/Documentation/DocBook/v4l/v4l2.xml
index 97801725b..97801725b 100644
--- a/staging-specs/v4l/v4l2.xml
+++ b/linux/Documentation/DocBook/v4l/v4l2.xml
diff --git a/staging-specs/v4l/vbi_525.gif b/linux/Documentation/DocBook/v4l/vbi_525.gif
index 5580b690d..5580b690d 100644
--- a/staging-specs/v4l/vbi_525.gif
+++ b/linux/Documentation/DocBook/v4l/vbi_525.gif
diff --git a/staging-specs/v4l/vbi_525.pdf b/linux/Documentation/DocBook/v4l/vbi_525.pdf
index 9e72c25b2..9e72c25b2 100644
--- a/staging-specs/v4l/vbi_525.pdf
+++ b/linux/Documentation/DocBook/v4l/vbi_525.pdf
diff --git a/staging-specs/v4l/vbi_625.gif b/linux/Documentation/DocBook/v4l/vbi_625.gif
index 34e325198..34e325198 100644
--- a/staging-specs/v4l/vbi_625.gif
+++ b/linux/Documentation/DocBook/v4l/vbi_625.gif
diff --git a/staging-specs/v4l/vbi_625.pdf b/linux/Documentation/DocBook/v4l/vbi_625.pdf
index 765235e33..765235e33 100644
--- a/staging-specs/v4l/vbi_625.pdf
+++ b/linux/Documentation/DocBook/v4l/vbi_625.pdf
diff --git a/staging-specs/v4l/vbi_hsync.gif b/linux/Documentation/DocBook/v4l/vbi_hsync.gif
index b02434d3b..b02434d3b 100644
--- a/staging-specs/v4l/vbi_hsync.gif
+++ b/linux/Documentation/DocBook/v4l/vbi_hsync.gif
diff --git a/staging-specs/v4l/vbi_hsync.pdf b/linux/Documentation/DocBook/v4l/vbi_hsync.pdf
index 200b66818..200b66818 100644
--- a/staging-specs/v4l/vbi_hsync.pdf
+++ b/linux/Documentation/DocBook/v4l/vbi_hsync.pdf
diff --git a/staging-specs/v4l/vidioc-dbg-g-chip-ident.xml b/linux/Documentation/DocBook/v4l/vidioc-dbg-g-chip-ident.xml
index 4a09e203a..4a09e203a 100644
--- a/staging-specs/v4l/vidioc-dbg-g-chip-ident.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-dbg-g-chip-ident.xml
diff --git a/staging-specs/v4l/vidioc-dbg-g-register.xml b/linux/Documentation/DocBook/v4l/vidioc-dbg-g-register.xml
index 980c7f3e2..980c7f3e2 100644
--- a/staging-specs/v4l/vidioc-dbg-g-register.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-dbg-g-register.xml
diff --git a/staging-specs/v4l/vidioc-encoder-cmd.xml b/linux/Documentation/DocBook/v4l/vidioc-encoder-cmd.xml
index b0dde9438..b0dde9438 100644
--- a/staging-specs/v4l/vidioc-encoder-cmd.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-encoder-cmd.xml
diff --git a/staging-specs/v4l/vidioc-enum-fmt.xml b/linux/Documentation/DocBook/v4l/vidioc-enum-fmt.xml
index 960d44615..960d44615 100644
--- a/staging-specs/v4l/vidioc-enum-fmt.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-enum-fmt.xml
diff --git a/staging-specs/v4l/vidioc-enum-frameintervals.xml b/linux/Documentation/DocBook/v4l/vidioc-enum-frameintervals.xml
index 3c216e113..3c216e113 100644
--- a/staging-specs/v4l/vidioc-enum-frameintervals.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-enum-frameintervals.xml
diff --git a/staging-specs/v4l/vidioc-enum-framesizes.xml b/linux/Documentation/DocBook/v4l/vidioc-enum-framesizes.xml
index 6afa4542c..6afa4542c 100644
--- a/staging-specs/v4l/vidioc-enum-framesizes.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-enum-framesizes.xml
diff --git a/staging-specs/v4l/vidioc-enumaudio.xml b/linux/Documentation/DocBook/v4l/vidioc-enumaudio.xml
index 9ae8f2d3a..9ae8f2d3a 100644
--- a/staging-specs/v4l/vidioc-enumaudio.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-enumaudio.xml
diff --git a/staging-specs/v4l/vidioc-enumaudioout.xml b/linux/Documentation/DocBook/v4l/vidioc-enumaudioout.xml
index d3d7c0ab1..d3d7c0ab1 100644
--- a/staging-specs/v4l/vidioc-enumaudioout.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-enumaudioout.xml
diff --git a/staging-specs/v4l/vidioc-enuminput.xml b/linux/Documentation/DocBook/v4l/vidioc-enuminput.xml
index 414856b82..414856b82 100644
--- a/staging-specs/v4l/vidioc-enuminput.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-enuminput.xml
diff --git a/staging-specs/v4l/vidioc-enumoutput.xml b/linux/Documentation/DocBook/v4l/vidioc-enumoutput.xml
index e8d16dcd5..e8d16dcd5 100644
--- a/staging-specs/v4l/vidioc-enumoutput.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-enumoutput.xml
diff --git a/staging-specs/v4l/vidioc-enumstd.xml b/linux/Documentation/DocBook/v4l/vidioc-enumstd.xml
index 95803fe2c..95803fe2c 100644
--- a/staging-specs/v4l/vidioc-enumstd.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-enumstd.xml
diff --git a/staging-specs/v4l/vidioc-g-audio.xml b/linux/Documentation/DocBook/v4l/vidioc-g-audio.xml
index 65361a8c2..65361a8c2 100644
--- a/staging-specs/v4l/vidioc-g-audio.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-audio.xml
diff --git a/staging-specs/v4l/vidioc-g-audioout.xml b/linux/Documentation/DocBook/v4l/vidioc-g-audioout.xml
index 3632730c5..3632730c5 100644
--- a/staging-specs/v4l/vidioc-g-audioout.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-audioout.xml
diff --git a/staging-specs/v4l/vidioc-g-crop.xml b/linux/Documentation/DocBook/v4l/vidioc-g-crop.xml
index d235b1ded..d235b1ded 100644
--- a/staging-specs/v4l/vidioc-g-crop.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-crop.xml
diff --git a/staging-specs/v4l/vidioc-g-ctrl.xml b/linux/Documentation/DocBook/v4l/vidioc-g-ctrl.xml
index 8b5e6ff7f..8b5e6ff7f 100644
--- a/staging-specs/v4l/vidioc-g-ctrl.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-ctrl.xml
diff --git a/staging-specs/v4l/vidioc-g-enc-index.xml b/linux/Documentation/DocBook/v4l/vidioc-g-enc-index.xml
index 9f242e4b2..9f242e4b2 100644
--- a/staging-specs/v4l/vidioc-g-enc-index.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-enc-index.xml
diff --git a/staging-specs/v4l/vidioc-g-ext-ctrls.xml b/linux/Documentation/DocBook/v4l/vidioc-g-ext-ctrls.xml
index 3aa7f8f9f..3aa7f8f9f 100644
--- a/staging-specs/v4l/vidioc-g-ext-ctrls.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-ext-ctrls.xml
diff --git a/staging-specs/v4l/vidioc-g-fbuf.xml b/linux/Documentation/DocBook/v4l/vidioc-g-fbuf.xml
index f70170626..f70170626 100644
--- a/staging-specs/v4l/vidioc-g-fbuf.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-fbuf.xml
diff --git a/staging-specs/v4l/vidioc-g-fmt.xml b/linux/Documentation/DocBook/v4l/vidioc-g-fmt.xml
index 7c7d1b72c..7c7d1b72c 100644
--- a/staging-specs/v4l/vidioc-g-fmt.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-fmt.xml
diff --git a/staging-specs/v4l/vidioc-g-frequency.xml b/linux/Documentation/DocBook/v4l/vidioc-g-frequency.xml
index 062d72069..062d72069 100644
--- a/staging-specs/v4l/vidioc-g-frequency.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-frequency.xml
diff --git a/staging-specs/v4l/vidioc-g-input.xml b/linux/Documentation/DocBook/v4l/vidioc-g-input.xml
index ed076e927..ed076e927 100644
--- a/staging-specs/v4l/vidioc-g-input.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-input.xml
diff --git a/staging-specs/v4l/vidioc-g-jpegcomp.xml b/linux/Documentation/DocBook/v4l/vidioc-g-jpegcomp.xml
index 77394b287..77394b287 100644
--- a/staging-specs/v4l/vidioc-g-jpegcomp.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-jpegcomp.xml
diff --git a/staging-specs/v4l/vidioc-g-modulator.xml b/linux/Documentation/DocBook/v4l/vidioc-g-modulator.xml
index 15ce660f0..15ce660f0 100644
--- a/staging-specs/v4l/vidioc-g-modulator.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-modulator.xml
diff --git a/staging-specs/v4l/vidioc-g-output.xml b/linux/Documentation/DocBook/v4l/vidioc-g-output.xml
index 3ea8c0ed8..3ea8c0ed8 100644
--- a/staging-specs/v4l/vidioc-g-output.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-output.xml
diff --git a/staging-specs/v4l/vidioc-g-parm.xml b/linux/Documentation/DocBook/v4l/vidioc-g-parm.xml
index 78332d365..78332d365 100644
--- a/staging-specs/v4l/vidioc-g-parm.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-parm.xml
diff --git a/staging-specs/v4l/vidioc-g-priority.xml b/linux/Documentation/DocBook/v4l/vidioc-g-priority.xml
index 5fb001978..5fb001978 100644
--- a/staging-specs/v4l/vidioc-g-priority.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-priority.xml
diff --git a/staging-specs/v4l/vidioc-g-sliced-vbi-cap.xml b/linux/Documentation/DocBook/v4l/vidioc-g-sliced-vbi-cap.xml
index 10e721b17..10e721b17 100644
--- a/staging-specs/v4l/vidioc-g-sliced-vbi-cap.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-sliced-vbi-cap.xml
diff --git a/staging-specs/v4l/vidioc-g-std.xml b/linux/Documentation/DocBook/v4l/vidioc-g-std.xml
index b6f5d267e..b6f5d267e 100644
--- a/staging-specs/v4l/vidioc-g-std.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-std.xml
diff --git a/staging-specs/v4l/vidioc-g-tuner.xml b/linux/Documentation/DocBook/v4l/vidioc-g-tuner.xml
index bd98c734c..bd98c734c 100644
--- a/staging-specs/v4l/vidioc-g-tuner.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-g-tuner.xml
diff --git a/staging-specs/v4l/vidioc-log-status.xml b/linux/Documentation/DocBook/v4l/vidioc-log-status.xml
index 2634b7c88..2634b7c88 100644
--- a/staging-specs/v4l/vidioc-log-status.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-log-status.xml
diff --git a/staging-specs/v4l/vidioc-overlay.xml b/linux/Documentation/DocBook/v4l/vidioc-overlay.xml
index 1036c582c..1036c582c 100644
--- a/staging-specs/v4l/vidioc-overlay.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-overlay.xml
diff --git a/staging-specs/v4l/vidioc-qbuf.xml b/linux/Documentation/DocBook/v4l/vidioc-qbuf.xml
index 187081778..187081778 100644
--- a/staging-specs/v4l/vidioc-qbuf.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-qbuf.xml
diff --git a/staging-specs/v4l/vidioc-querybuf.xml b/linux/Documentation/DocBook/v4l/vidioc-querybuf.xml
index d834993e6..d834993e6 100644
--- a/staging-specs/v4l/vidioc-querybuf.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-querybuf.xml
diff --git a/staging-specs/v4l/vidioc-querycap.xml b/linux/Documentation/DocBook/v4l/vidioc-querycap.xml
index 6ab7e25b3..6ab7e25b3 100644
--- a/staging-specs/v4l/vidioc-querycap.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-querycap.xml
diff --git a/staging-specs/v4l/vidioc-queryctrl.xml b/linux/Documentation/DocBook/v4l/vidioc-queryctrl.xml
index 4876ff1a1..4876ff1a1 100644
--- a/staging-specs/v4l/vidioc-queryctrl.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-queryctrl.xml
diff --git a/staging-specs/v4l/vidioc-querystd.xml b/linux/Documentation/DocBook/v4l/vidioc-querystd.xml
index b5a7ff934..b5a7ff934 100644
--- a/staging-specs/v4l/vidioc-querystd.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-querystd.xml
diff --git a/staging-specs/v4l/vidioc-reqbufs.xml b/linux/Documentation/DocBook/v4l/vidioc-reqbufs.xml
index bab380844..bab380844 100644
--- a/staging-specs/v4l/vidioc-reqbufs.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-reqbufs.xml
diff --git a/staging-specs/v4l/vidioc-s-hw-freq-seek.xml b/linux/Documentation/DocBook/v4l/vidioc-s-hw-freq-seek.xml
index 14b3ec7ed..14b3ec7ed 100644
--- a/staging-specs/v4l/vidioc-s-hw-freq-seek.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-s-hw-freq-seek.xml
diff --git a/staging-specs/v4l/vidioc-streamon.xml b/linux/Documentation/DocBook/v4l/vidioc-streamon.xml
index e42bff1f2..e42bff1f2 100644
--- a/staging-specs/v4l/vidioc-streamon.xml
+++ b/linux/Documentation/DocBook/v4l/vidioc-streamon.xml
diff --git a/staging-specs/Makefile b/staging-specs/Makefile
index 776bf292e..a3057e985 100644
--- a/staging-specs/Makefile
+++ b/staging-specs/Makefile
@@ -363,8 +363,19 @@ DOCUMENTED = \
 	-e ":a;s/\(linkend=\".*\)_\(.*\">\)/\1-\2/;ta" \
 	-e "s/\(linkend\=\"\)v4l2\-mpeg\-vbi\-ITV0/\1v4l2-mpeg-vbi-itv0-1/g"
 
+.PHONY: links
 
-v4l/libv4l-fmt.xml:
+$(SGMLS): links
+$(PDFPICS): links
+$(GIFPICS): links
+
+links::
+	-rm v4l dvb
+	ln -sf ../linux/Documentation/DocBook/media.xml .
+	ln -sf ../linux/Documentation/DocBook/v4l .
+	ln -sf ../linux/Documentation/DocBook/dvb .
+
+v4l/libv4l-fmt.xml: ../v4l2-apps/libv4l/libv4lconvert/*.c Makefile
 	cat ../v4l2-apps/libv4l/libv4lconvert/*.c| \
 	perl -ne 'if (m/(V4L2_PIX_FMT_[^\s\;\\)\,:]+)/) { printf "<link linkend=\"$$1\"><constant>$$1</constant></link>,\n"; };' \
 	|sort|uniq| \
@@ -398,7 +409,7 @@ v4l/videodev2.h.xml: ../linux/include/linux/videodev2.h Makefile
 	  sed 's/i\.e\./&ie;/' >> $@
 	echo "</programlisting>" >> $@
 
-checks:
+checks: $(SGMLS)
 	# Warn about <constant>FOO-BAR</constant> which should be
 	# &FOO-BAR; or <constant>FOO_BAR</constant>.
 	(! grep '>[A-Z]+-[A-Z-]+<' $(V4L_SGMLS))
@@ -422,7 +433,7 @@ checks:
 # We're generating these entities to avoid typos, to enforce consistent
 # naming, an to be warned about missing items (Jade screams bloody murder
 # if references are dangling).
-media-entities.xml: Makefile
+media-entities.xml: Makefile $(SGMLS)
 	echo "<!-- Generated file! Do not edit. -->" >$@
 	echo -e "\n<!-- Functions -->" >>$@
 	for ident in $(FUNCS) ; do \
@@ -481,7 +492,7 @@ media-entities.xml: Makefile
 
 # Jade can auto-generate a list-of-tables, which includes all structs,
 # but we only want data types, all types, and sorted please.
-media-indices.xml: Makefile
+media-indices.xml: Makefile $(SGMLS)
 	echo "<!-- Generated file! Do not edit. -->" >$@
 	echo -e "\n<index><title>List of Types</title>" >>$@
 	for ident in $(TYPES) ; do \
@@ -572,3 +583,4 @@ distclean clean:
 	rm -f capture
 	rm -f media-indices.xml media-entities.xml
 	rm -rf media media-single media.pdf
+	rm -rf media.xml v4l dvb