From 97aee39585b4e9fb7407195eb69a4b224bd27f08 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Tue, 22 Apr 2008 14:41:44 -0300
Subject: [PATCH] --- yaml --- r: 92351 b: refs/heads/master c:
 5eedc466758b5743512d38b5d1eab6f799a39e00 h: refs/heads/master i:   92349:
 517d43232fe8a63cc6e2dc4b806cf4f47944b60c   92347:
 04ddeb29592fcb83982d541f6f3d60fd9bac77de   92343:
 fcc7b4415f4a4ca75da5875739e1b1d8451471e4   92335:
 8c27bf030c014e13eb4fe706fd407c40c2c4b547   92319:
 7352777896fcaa7017d002b77bfa5da73acc5bfb   92287:
 86611ad5b390e9e9affe165b2e495ee2aa98c0b1 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/video/ivtv/ivtv-yuv.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index becf4dc99b9a..d6515d6ed642 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ba0a3c0e8147e5c8d04f2b284c44222af517307
+refs/heads/master: 5eedc466758b5743512d38b5d1eab6f799a39e00
diff --git a/trunk/drivers/media/video/ivtv/ivtv-yuv.c b/trunk/drivers/media/video/ivtv/ivtv-yuv.c
index 85183480a225..8fdd67cef74c 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-yuv.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-yuv.c
@@ -914,7 +914,7 @@ static void ivtv_yuv_init(struct ivtv *itv)
 }
 
 /* Get next available yuv buffer on PVR350 */
-void ivtv_yuv_next_free(struct ivtv *itv)
+static void ivtv_yuv_next_free(struct ivtv *itv)
 {
 	int draw, display;
 	struct yuv_playback_info *yi = &itv->yuv_info;
@@ -937,7 +937,7 @@ void ivtv_yuv_next_free(struct ivtv *itv)
 }
 
 /* Set up frame according to ivtv_dma_frame parameters */
-void ivtv_yuv_setup_frame(struct ivtv *itv, struct ivtv_dma_frame *args)
+static void ivtv_yuv_setup_frame(struct ivtv *itv, struct ivtv_dma_frame *args)
 {
 	struct yuv_playback_info *yi = &itv->yuv_info;
 	u8 frame = yi->draw_frame;
@@ -1042,7 +1042,7 @@ void ivtv_yuv_frame_complete(struct ivtv *itv)
 			(itv->yuv_info.draw_frame + 1) % IVTV_YUV_BUFFERS);
 }
 
-int ivtv_yuv_udma_frame(struct ivtv *itv, struct ivtv_dma_frame *args)
+static int ivtv_yuv_udma_frame(struct ivtv *itv, struct ivtv_dma_frame *args)
 {
 	DEFINE_WAIT(wait);
 	int rc = 0;