Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...

[pandora-kernel.git] / drivers / infiniband / hw / amso1100 / c2_alloc.c

diff --git a/drivers/infiniband/hw/amso1100/c2_alloc.c b/drivers/infiniband/hw/amso1100/c2_alloc.c
index d4f5f5d..78d247e 100644 (file)
--- a/drivers/infiniband/hw/amso1100/c2_alloc.c
+++ b/drivers/infiniband/hw/amso1100/c2_alloc.c
@@ -49,7 +49,7 @@ static int c2_alloc_mqsp_chunk(struct c2_dev *c2dev, gfp_t gfp_mask,
                return -ENOMEM;
 
        new_head->dma_addr = dma_addr;
-       pci_unmap_addr_set(new_head, mapping, new_head->dma_addr);
+       dma_unmap_addr_set(new_head, mapping, new_head->dma_addr);
 
        new_head->next = NULL;
        new_head->head = 0;
@@ -81,7 +81,7 @@ void c2_free_mqsp_pool(struct c2_dev *c2dev, struct sp_chunk *root)
        while (root) {
                next = root->next;
                dma_free_coherent(&c2dev->pcidev->dev, PAGE_SIZE, root,
-                                 pci_unmap_addr(root, mapping));
+                                 dma_unmap_addr(root, mapping));
                root = next;
        }
 }