From b55dedfd53f67495fc10be162869c820e2d07ded Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 2 May 2012 17:12:22 -0700 Subject: [PATCH] --- yaml --- r: 304548 b: refs/heads/master c: a11cfdf4589f2f9f70d398d123c459d33dfc6bb2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/vme/bridges/vme_ca91cx42.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c470d1d8cd02..a6cc0b61f8cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a508ff407ea2ac0ca731962e011fad1534b52e4 +refs/heads/master: a11cfdf4589f2f9f70d398d123c459d33dfc6bb2 diff --git a/trunk/drivers/vme/bridges/vme_ca91cx42.c b/trunk/drivers/vme/bridges/vme_ca91cx42.c index a3c0f84e2fa1..e0df92ec44bd 100644 --- a/trunk/drivers/vme/bridges/vme_ca91cx42.c +++ b/trunk/drivers/vme/bridges/vme_ca91cx42.c @@ -1501,7 +1501,7 @@ static int ca91cx42_slot_get(struct vme_bridge *ca91cx42_bridge) } -void *ca91cx42_alloc_consistent(struct device *parent, size_t size, +static void *ca91cx42_alloc_consistent(struct device *parent, size_t size, dma_addr_t *dma) { struct pci_dev *pdev; @@ -1512,8 +1512,8 @@ void *ca91cx42_alloc_consistent(struct device *parent, size_t size, return pci_alloc_consistent(pdev, size, dma); } -void ca91cx42_free_consistent(struct device *parent, size_t size, void *vaddr, - dma_addr_t dma) +static void ca91cx42_free_consistent(struct device *parent, size_t size, + void *vaddr, dma_addr_t dma) { struct pci_dev *pdev;