Commit b6420ebd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d2901069 0415447a

Documentation/.gitignore

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
filesystems/dnotify_test

laptops/dslm

timers/hpet_example

vm/hugepage-mmap

vm/hugepage-shm

vm/map_hugetlb

Documentation/DMA-API-HOWTO.txt

+3 −3
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ To map a single region, you do: 
	size_t size = buffer->len;



	dma_handle = dma_map_single(dev, addr, size, direction);

	if (dma_mapping_error(dma_handle)) {

	if (dma_mapping_error(dev, dma_handle)) {

		/*

		 * reduce current DMA mapping usage,

		 * delay and try again later or
@@ -588,7 +588,7 @@ Specifically: 
	size_t size = buffer->len;



	dma_handle = dma_map_page(dev, page, offset, size, direction);

	if (dma_mapping_error(dma_handle)) {

	if (dma_mapping_error(dev, dma_handle)) {

		/*

		 * reduce current DMA mapping usage,

		 * delay and try again later or
@@ -689,7 +689,7 @@ to use the dma_sync_*() interfaces. 
		dma_addr_t mapping;



		mapping = dma_map_single(cp->dev, buffer, len, DMA_FROM_DEVICE);

		if (dma_mapping_error(dma_handle)) {

		if (dma_mapping_error(cp->dev, dma_handle)) {

			/*

			 * reduce current DMA mapping usage,

			 * delay and try again later or

Documentation/DocBook/media/v4l/common.xml

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ makes no provisions to find these related devices. Some really 
complex devices use the Media Controller (see <xref linkend="media_controller" />)

which can be used for this purpose. But most drivers do not use it,

and while some code exists that uses sysfs to discover related devices

(see libmedia_dev in the <ulink url="http://git.linuxtv.org/v4l-utils/">v4l-utils</ulink>

(see libmedia_dev in the <ulink url="http://git.linuxtv.org/cgit.cgi/v4l-utils.git/">v4l-utils</ulink>

git repository), there is no library yet that can provide a single API towards

both Media Controller-based devices and devices that do not use the Media Controller.

If you want to work on this please write to the linux-media mailing list: &v4l-ml;.</para>

Documentation/Makefile

+4 −3
Original line number Diff line number Diff line 
obj-m := DocBook/ accounting/ auxdisplay/ connector/ \

	filesystems/ filesystems/configfs/ ia64/ laptops/ networking/ \

	pcmcia/ spi/ timers/ watchdog/src/ misc-devices/mei/
 
subdir-y := accounting arm auxdisplay blackfin connector \

	filesystems filesystems ia64 laptops mic misc-devices \

	networking pcmcia prctl ptp spi timers vDSO video4linux \

	watchdog

Documentation/accounting/Makefile

+0 −3
Original line number Diff line number Diff line 
# kbuild trick to avoid linker error. Can be omitted if a module is built.

obj- := dummy.o



# List of programs to build

hostprogs-y := getdelays

CRA Git | Maintained and supported by SUSTech CRA and CCSE