diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
| commit | b4b7a4ef097f288f724420b473dbf92a89c0ab7e (patch) | |
| tree | 23ad8101e3e77c32a8d1e1b95a9c1cd7f7a475b7 /drivers/dma/coh901318_lli.h | |
| parent | e9ce335df51ff782035a15c261a3c0c9892a1767 (diff) | |
| parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) | |
Merge branch 'master' into for-linus
Conflicts:
block/Kconfig
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/dma/coh901318_lli.h')
| -rw-r--r-- | drivers/dma/coh901318_lli.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/coh901318_lli.h b/drivers/dma/coh901318_lli.h index 7bf713b79c6b..7a5c80990e9e 100644 --- a/drivers/dma/coh901318_lli.h +++ b/drivers/dma/coh901318_lli.h | |||
| @@ -30,7 +30,7 @@ struct device; | |||
| 30 | * @pool: pool handle | 30 | * @pool: pool handle |
| 31 | * @dev: dma device | 31 | * @dev: dma device |
| 32 | * @lli_nbr: number of lli:s in the pool | 32 | * @lli_nbr: number of lli:s in the pool |
| 33 | * @algin: adress alignemtn of lli:s | 33 | * @algin: address alignemtn of lli:s |
| 34 | * returns 0 on success otherwise none zero | 34 | * returns 0 on success otherwise none zero |
| 35 | */ | 35 | */ |
| 36 | int coh901318_pool_create(struct coh901318_pool *pool, | 36 | int coh901318_pool_create(struct coh901318_pool *pool, |