Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc

Pull documentation updates from Jiri Kosina:
 "Updates to kernel documentation.

  I took this over (hopefully temporarily) from Randy who was not
  willing to maintain it any longer.  This pile mostly is a relay of
  queue that Randy already had in his tree"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc:
  Documentation: fix broken v4l-utils URL
  Documentation: update include path for mpssd
  Documentation: correct parameter error for dma_mapping_error
  MAINTAINERS: update location of linux-doc tree
  Documentation: remove networking/.gitignore
  tools: add more endian.h macros
  Make Documenation depend on headers_install
  Docs: this_cpu_ops: remove redundant add forms
  Documentation: disable vdso_test to avoid breakage with old glibc
  Documentation: update vDSO makefile to build portable examples
  Documentation: update .gitignore files
  Documentation: support glibc versions without htole macros
  v4l2-pci-skeleton: Only build if PCI is available
  Documentation: fix misc. warnings
  Documentation: make functions static to avoid prototype warnings
  Documentation: add makefiles for more targets
  Documentation: use subdir-y to avoid unnecessary built-in.o files

2 files changed, 10 insertions, 1 deletions

diff --git a/drivers/media/rc/keymaps/Kconfig b/drivers/media/rc/keymaps/Kconfig
index 8e615fd55852..767423bbbdd0 100644
--- a/drivers/media/rc/keymaps/Kconfig
+++ b/drivers/media/rc/keymaps/Kconfig
@@ -12,4 +12,4 @@ config RC_MAP
            The ir-keytable program, available at v4l-utils package
            provide the tool and the same RC maps for load from
            userspace. Its available at
-                        http://git.linuxtv.org/v4l-utils
+                http://git.linuxtv.org/cgit.cgi/v4l-utils.git/
diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig
index 9ca0f8d59a14..ba7e21a73023 100644
--- a/drivers/media/v4l2-core/Kconfig
+++ b/drivers/media/v4l2-core/Kconfig
@@ -25,6 +25,15 @@ config VIDEO_FIXED_MINOR_RANGES
 
           When in doubt, say N.
 
+config VIDEO_PCI_SKELETON
+        tristate "Skeleton PCI V4L2 driver"
+        depends on PCI && BUILD_DOCSRC
+        depends on VIDEO_V4L2 && VIDEOBUF2_CORE
+        depends on VIDEOBUF2_MEMOPS && VIDEOBUF2_DMA_CONTIG
+        ---help---
+          Enable build of the skeleton PCI driver, used as a reference
+          when developing new drivers.
+
 # Used by drivers that need tuner.ko
 config VIDEO_TUNER
         tristate