diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-15 15:29:50 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-15 15:29:50 -0500 |
commit | 65e5d002b5ad220db2bf9557f53de5a98f7dab86 (patch) | |
tree | 93d36afd4b82a24e5b553766a574a6632fca3aff /arch/arm/mm/dma-mapping.c | |
parent | 38567333a6dabd0f2b4150e9fb6dd8e3ba2985e5 (diff) | |
parent | cb4d3eaebb96616085f5a46a7d7e004ddd955b09 (diff) |
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: fix missing branch in __error_a
ARM: fix /proc/$PID/stack on SMP
ARM: Fix build regression on SA11x0, PXA, and H720x targets
ARM: 6625/1: use memblock memory regions for "System RAM" I/O resources
ARM: fix wrongly patched constants
ARM: 6624/1: fix dependency for CONFIG_SMP_ON_UP
ARM: 6623/1: Thumb-2: Fix out-of-range offset for Thumb-2 in proc-v7.S
ARM: 6622/1: fix dma_unmap_sg() documentation
ARM: 6621/1: bitops: remove condition code clobber for CLZ
ARM: 6620/1: Change misleading warning when CONFIG_CMDLINE_FORCE is used
ARM: 6619/1: nommu: avoid mapping vectors page when !CONFIG_MMU
ARM: sched_clock: make minsec argument to clocks_calc_mult_shift() zero
ARM: sched_clock: allow init_sched_clock() to be called early
ARM: integrator: fix compile warning in cpu.c
ARM: 6616/1: Fix ep93xx-fb init/exit annotations
ARM: twd: fix display of twd frequency
ARM: udelay: prevent math rounding resulting in short udelays
Diffstat (limited to 'arch/arm/mm/dma-mapping.c')
-rw-r--r-- | arch/arm/mm/dma-mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 6b48e0a3d7aa..4771dba61448 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c | |||
@@ -577,7 +577,7 @@ EXPORT_SYMBOL(dma_map_sg); | |||
577 | * dma_unmap_sg - unmap a set of SG buffers mapped by dma_map_sg | 577 | * dma_unmap_sg - unmap a set of SG buffers mapped by dma_map_sg |
578 | * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices | 578 | * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices |
579 | * @sg: list of buffers | 579 | * @sg: list of buffers |
580 | * @nents: number of buffers to unmap (returned from dma_map_sg) | 580 | * @nents: number of buffers to unmap (same as was passed to dma_map_sg) |
581 | * @dir: DMA transfer direction (same as was passed to dma_map_sg) | 581 | * @dir: DMA transfer direction (same as was passed to dma_map_sg) |
582 | * | 582 | * |
583 | * Unmap a set of streaming mode DMA translations. Again, CPU access | 583 | * Unmap a set of streaming mode DMA translations. Again, CPU access |