From 36799f3b449bcb170f4b3804355faaa98174c413 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten lin Date: Wed, 2 May 2012 17:08:38 -0700 Subject: [PATCH] --- yaml --- r: 304547 b: refs/heads/master c: 8a508ff407ea2ac0ca731962e011fad1534b52e4 h: refs/heads/master i: 304545: ab0337da81f4f8c99e63b9a3ac4f7cbcb6b84288 304543: c008f6fe9ad4ab829a6feae4e90d21ba28d35694 v: v3 --- [refs] | 2 +- trunk/drivers/vme/bridges/vme_tsi148.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 136c1201f433..c470d1d8cd02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61cd983c4c312b6a679f7ee3ba31aec20c044a41 +refs/heads/master: 8a508ff407ea2ac0ca731962e011fad1534b52e4 diff --git a/trunk/drivers/vme/bridges/vme_tsi148.c b/trunk/drivers/vme/bridges/vme_tsi148.c index 081e9c4c5e71..f6385f7a66d9 100644 --- a/trunk/drivers/vme/bridges/vme_tsi148.c +++ b/trunk/drivers/vme/bridges/vme_tsi148.c @@ -2141,7 +2141,7 @@ static int tsi148_slot_get(struct vme_bridge *tsi148_bridge) return (int)slot; } -void *tsi148_alloc_consistent(struct device *parent, size_t size, +static void *tsi148_alloc_consistent(struct device *parent, size_t size, dma_addr_t *dma) { struct pci_dev *pdev; @@ -2152,8 +2152,8 @@ void *tsi148_alloc_consistent(struct device *parent, size_t size, return pci_alloc_consistent(pdev, size, dma); } -void tsi148_free_consistent(struct device *parent, size_t size, void *vaddr, - dma_addr_t dma) +static void tsi148_free_consistent(struct device *parent, size_t size, + void *vaddr, dma_addr_t dma) { struct pci_dev *pdev;