aboutsummaryrefslogtreecommitdiffstats
path: root/lib/swiotlb.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
committerJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
commitd014d043869cdc591f3a33243d3481fa4479c2d0 (patch)
tree63626829498e647ba058a1ce06419fe7e4d5f97d /lib/swiotlb.c
parent6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parent6070d81eb5f2d4943223c96e7609a53cdc984364 (diff)
Merge branch 'for-next' into for-linus
Conflicts: kernel/irq/chip.c
Diffstat (limited to 'lib/swiotlb.c')
-rw-r--r--lib/swiotlb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 795472d8ae24..5bc01803f8f8 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -485,7 +485,7 @@ do_unmap_single(struct device *hwdev, char *dma_addr, size_t size, int dir)
485 485
486 /* 486 /*
487 * Return the buffer to the free list by setting the corresponding 487 * Return the buffer to the free list by setting the corresponding
488 * entries to indicate the number of contigous entries available. 488 * entries to indicate the number of contiguous entries available.
489 * While returning the entries to the free list, we merge the entries 489 * While returning the entries to the free list, we merge the entries
490 * with slots below and above the pool being returned. 490 * with slots below and above the pool being returned.
491 */ 491 */