From e8399f11ed2fa0e0395dac6f4a0372364758323d Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai.lu@sun.com>
Date: Sat, 21 Jul 2007 17:11:05 +0200
Subject: [PATCH] --- yaml --- r: 62419 b: refs/heads/master c:
 0b11e1c6a604014283af70e27e0f32971407fd6d h: refs/heads/master i:   62417:
 e4d2fdb96bfb813c29f3f1b04a4bd5088e013586   62415:
 443b8456891fbe991d670c77ecaf26216d51b25e v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86_64/kernel/pci-calgary.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 80b81d5d266e..546f1bbf2eae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 820a149705c2c2a37989554a4f4a34e3d0b0df1f
+refs/heads/master: 0b11e1c6a604014283af70e27e0f32971407fd6d
diff --git a/trunk/arch/x86_64/kernel/pci-calgary.c b/trunk/arch/x86_64/kernel/pci-calgary.c
index fa50d6a1ce46..d10fee8c2418 100644
--- a/trunk/arch/x86_64/kernel/pci-calgary.c
+++ b/trunk/arch/x86_64/kernel/pci-calgary.c
@@ -429,7 +429,7 @@ static int calgary_nontranslate_map_sg(struct device* dev,
 	return nelems;
 }
 
-int calgary_map_sg(struct device *dev, struct scatterlist *sg,
+static int calgary_map_sg(struct device *dev, struct scatterlist *sg,
 	int nelems, int direction)
 {
 	struct iommu_table *tbl = find_iommu_table(dev);
@@ -474,7 +474,7 @@ int calgary_map_sg(struct device *dev, struct scatterlist *sg,
 	return 0;
 }
 
-dma_addr_t calgary_map_single(struct device *dev, void *vaddr,
+static dma_addr_t calgary_map_single(struct device *dev, void *vaddr,
 	size_t size, int direction)
 {
 	dma_addr_t dma_handle = bad_dma_address;
@@ -493,7 +493,7 @@ dma_addr_t calgary_map_single(struct device *dev, void *vaddr,
 	return dma_handle;
 }
 
-void calgary_unmap_single(struct device *dev, dma_addr_t dma_handle,
+static void calgary_unmap_single(struct device *dev, dma_addr_t dma_handle,
 	size_t size, int direction)
 {
 	struct iommu_table *tbl = find_iommu_table(dev);
@@ -506,7 +506,7 @@ void calgary_unmap_single(struct device *dev, dma_addr_t dma_handle,
 	iommu_free(tbl, dma_handle, npages);
 }
 
-void* calgary_alloc_coherent(struct device *dev, size_t size,
+static void* calgary_alloc_coherent(struct device *dev, size_t size,
 	dma_addr_t *dma_handle, gfp_t flag)
 {
 	void *ret = NULL;