diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-14 02:49:06 +0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-14 02:49:06 +0400 |
| commit | 7217cbccbd0c620a6d234ebbe5e58d46d2188d0e (patch) | |
| tree | ed8ad2161ca664c9100cb3fc1f9b0d8c3762500c /include/linux/dmapool.h | |
| parent | 6cd7525a00f3b926e8bd2e402954ed3e09a8e924 (diff) | |
| parent | c931488cc4619eecfe68a2f046b5898fddc2f904 (diff) | |
| download | linux-7217cbccbd0c620a6d234ebbe5e58d46d2188d0e.tar.xz | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/dmapool.h')
| -rw-r--r-- | include/linux/dmapool.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dmapool.h b/include/linux/dmapool.h index 4932ee5c77f0..76f12f46db7f 100644 --- a/include/linux/dmapool.h +++ b/include/linux/dmapool.h @@ -19,7 +19,7 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, void dma_pool_destroy(struct dma_pool *pool); -void *dma_pool_alloc(struct dma_pool *pool, unsigned int __nocast mem_flags, +void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags, dma_addr_t *handle); void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t addr); |