From 7338c6bfc854c8c253cf609cdf4d5303d349645f Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Tue, 11 May 2010 10:36:32 -0300
Subject: [PATCH] --- yaml --- r: 202044 b: refs/heads/master c:
 7181772d8915e6025ee4f2f6c5b16064689646f0 h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/media/video/videobuf-dma-sg.c | 18 ++++++++++++++----
 trunk/include/media/videobuf-dma-sg.h       | 17 -----------------
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index eed9399383b6..f72fee767861 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fecfedeb27ab9497cbdd2c6fb7972082a7ed9263
+refs/heads/master: 7181772d8915e6025ee4f2f6c5b16064689646f0
diff --git a/trunk/drivers/media/video/videobuf-dma-sg.c b/trunk/drivers/media/video/videobuf-dma-sg.c
index 17b1f89e8133..8924e51408c1 100644
--- a/trunk/drivers/media/video/videobuf-dma-sg.c
+++ b/trunk/drivers/media/video/videobuf-dma-sg.c
@@ -57,7 +57,13 @@ MODULE_LICENSE("GPL");
 
 /* --------------------------------------------------------------------- */
 
-struct scatterlist *videobuf_vmalloc_to_sg(unsigned char *virt, int nr_pages)
+/*
+ * Return a scatterlist for some page-aligned vmalloc()'ed memory
+ * block (NULL on errors).  Memory for the scatterlist is allocated
+ * using kmalloc.  The caller must free the memory.
+ */
+static struct scatterlist *videobuf_vmalloc_to_sg(unsigned char *virt,
+						  int nr_pages)
 {
 	struct scatterlist *sglist;
 	struct page *pg;
@@ -81,10 +87,14 @@ struct scatterlist *videobuf_vmalloc_to_sg(unsigned char *virt, int nr_pages)
 	vfree(sglist);
 	return NULL;
 }
-EXPORT_SYMBOL_GPL(videobuf_vmalloc_to_sg);
 
-struct scatterlist *videobuf_pages_to_sg(struct page **pages, int nr_pages,
-					 int offset)
+/*
+ * Return a scatterlist for a an array of userpages (NULL on errors).
+ * Memory for the scatterlist is allocated using kmalloc.  The caller
+ * must free the memory.
+ */
+static struct scatterlist *videobuf_pages_to_sg(struct page **pages,
+						int nr_pages, int offset)
 {
 	struct scatterlist *sglist;
 	int i;
diff --git a/trunk/include/media/videobuf-dma-sg.h b/trunk/include/media/videobuf-dma-sg.h
index 80130100e450..913860e9c845 100644
--- a/trunk/include/media/videobuf-dma-sg.h
+++ b/trunk/include/media/videobuf-dma-sg.h
@@ -24,23 +24,6 @@
 
 /* --------------------------------------------------------------------- */
 
-/*
- * Return a scatterlist for some page-aligned vmalloc()'ed memory
- * block (NULL on errors).  Memory for the scatterlist is allocated
- * using kmalloc.  The caller must free the memory.
- */
-struct scatterlist *videobuf_vmalloc_to_sg(unsigned char *virt, int nr_pages);
-
-/*
- * Return a scatterlist for a an array of userpages (NULL on errors).
- * Memory for the scatterlist is allocated using kmalloc.  The caller
- * must free the memory.
- */
-struct scatterlist *videobuf_pages_to_sg(struct page **pages, int nr_pages,
-					 int offset);
-
-/* --------------------------------------------------------------------- */
-
 /*
  * A small set of helper functions to manage buffers (both userland
  * and kernel) for DMA.