diff options
author | Roland Dreier <rolandd@cisco.com> | 2005-10-28 15:50:51 -0700 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2005-10-28 15:50:51 -0700 |
commit | a4da0628efd788eb199dd9df225e296035ec2539 (patch) | |
tree | 1e611030c993e1480dc2f07f26976d2d33002b0d /arch/ia64/lib/swiotlb.c | |
parent | 70a30e16a8a9d22396a4d1e96af86e43594df584 (diff) | |
parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ia64/lib/swiotlb.c')
-rw-r--r-- | arch/ia64/lib/swiotlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/lib/swiotlb.c b/arch/ia64/lib/swiotlb.c index a604efc7f6c9..3ebbb3c8ba36 100644 --- a/arch/ia64/lib/swiotlb.c +++ b/arch/ia64/lib/swiotlb.c @@ -314,7 +314,7 @@ sync_single(struct device *hwdev, char *dma_addr, size_t size, int dir) void * swiotlb_alloc_coherent(struct device *hwdev, size_t size, - dma_addr_t *dma_handle, int flags) + dma_addr_t *dma_handle, gfp_t flags) { unsigned long dev_addr; void *ret; |