diff options
author | Greg KH <gregkh@suse.de> | 2005-09-12 12:10:59 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 12:10:59 -0700 |
commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /Documentation/DMA-API.txt | |
parent | [PATCH] I2C: i2c-nforce2: drop unused define (diff) | |
parent | [PATCH] x86-64: clean up local_add/sub arguments (diff) | |
download | linux-dev-ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489.tar.xz linux-dev-ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489.zip |
Merge ../torvalds-2.6/
Diffstat (limited to 'Documentation/DMA-API.txt')
-rw-r--r-- | Documentation/DMA-API.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt index 6ee3cd6134df..1af0f2d50220 100644 --- a/Documentation/DMA-API.txt +++ b/Documentation/DMA-API.txt @@ -121,7 +121,7 @@ pool's device. dma_addr_t addr); This puts memory back into the pool. The pool is what was passed to -the the pool allocation routine; the cpu and dma addresses are what +the pool allocation routine; the cpu and dma addresses are what were returned when that routine allocated the memory being freed. |