diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:30:16 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:30:16 +0200 |
| commit | 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 (patch) | |
| tree | e65562d7300ac653207b1e45ec7e5960ddf78fff /include/asm-xtensa/dma-mapping.h | |
| parent | [libata pdc_adma] update for removal of ATA_FLAG_NOINTR (diff) | |
| parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff) | |
| download | linux-15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83.tar.xz linux-15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83.zip | |
Merge branch 'master'
Diffstat (limited to 'include/asm-xtensa/dma-mapping.h')
| -rw-r--r-- | include/asm-xtensa/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-xtensa/dma-mapping.h b/include/asm-xtensa/dma-mapping.h index e86a206f1209..c425f10d086a 100644 --- a/include/asm-xtensa/dma-mapping.h +++ b/include/asm-xtensa/dma-mapping.h @@ -28,7 +28,7 @@ extern void consistent_sync(void*, size_t, int); #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) void *dma_alloc_coherent(struct device *dev, size_t size, - dma_addr_t *dma_handle, int flag); + dma_addr_t *dma_handle, gfp_t flag); void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle); |