From 137b6fd62523f7c795b8a3686dd14e8c30392c5e Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Thu, 10 May 2012 03:35:48 -0300
Subject: [PATCH] --- yaml --- r: 306489 b: refs/heads/master c:
 ec76afe8970b5110fd6ef1797606f089aec2f134 h: refs/heads/master i:   306487:
 bf8a493446c089cdf11e364afb65207dd98896af v: v3

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

diff --git a/[refs] b/[refs]
index 8e26b41c4713..ae76f3c60ab4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2356877cb12969cac1572f195d541a2b49d7d78e
+refs/heads/master: ec76afe8970b5110fd6ef1797606f089aec2f134
diff --git a/trunk/drivers/media/video/s5p-g2d/g2d.c b/trunk/drivers/media/video/s5p-g2d/g2d.c
index 059d93210670..2270b7c1425b 100644
--- a/trunk/drivers/media/video/s5p-g2d/g2d.c
+++ b/trunk/drivers/media/video/s5p-g2d/g2d.c
@@ -65,7 +65,7 @@ static struct g2d_fmt formats[] = {
 };
 #define NUM_FORMATS ARRAY_SIZE(formats)
 
-struct g2d_frame def_frame = {
+static struct g2d_frame def_frame = {
 	.width		= DEFAULT_WIDTH,
 	.height		= DEFAULT_HEIGHT,
 	.c_width	= DEFAULT_WIDTH,
@@ -77,7 +77,7 @@ struct g2d_frame def_frame = {
 	.bottom		= DEFAULT_HEIGHT,
 };
 
-struct g2d_fmt *find_fmt(struct v4l2_format *f)
+static struct g2d_fmt *find_fmt(struct v4l2_format *f)
 {
 	unsigned int i;
 	for (i = 0; i < NUM_FORMATS; i++) {
@@ -202,7 +202,7 @@ static const struct v4l2_ctrl_ops g2d_ctrl_ops = {
 	.s_ctrl		= g2d_s_ctrl,
 };
 
-int g2d_setup_ctrls(struct g2d_ctx *ctx)
+static int g2d_setup_ctrls(struct g2d_ctx *ctx)
 {
 	struct g2d_dev *dev = ctx->dev;