From 0e9b2cbdd984f6b6f6fd25ae8f57063b00f57f81 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Fri, 25 Jul 2008 19:46:27 -0700
Subject: [PATCH] --- yaml --- r: 106260 b: refs/heads/master c:
 6ca813c4e515d9b868cd71703ef15f4af3aebb21 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/stifb.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index cfce47ab3dd2..0670e15d95b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d1e412ac5570a669e1b1fc5fd0f6859250c3d76
+refs/heads/master: 6ca813c4e515d9b868cd71703ef15f4af3aebb21
diff --git a/trunk/drivers/video/stifb.c b/trunk/drivers/video/stifb.c
index 598d35eff935..166481402412 100644
--- a/trunk/drivers/video/stifb.c
+++ b/trunk/drivers/video/stifb.c
@@ -1078,8 +1078,7 @@ static struct fb_ops stifb_ops = {
  *  Initialization
  */
 
-int __init
-stifb_init_fb(struct sti_struct *sti, int bpp_pref)
+static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref)
 {
 	struct fb_fix_screeninfo *fix;
 	struct fb_var_screeninfo *var;
@@ -1315,8 +1314,7 @@ static int stifb_disabled __initdata;
 int __init
 stifb_setup(char *options);
 
-int __init
-stifb_init(void)
+static int __init stifb_init(void)
 {
 	struct sti_struct *sti;
 	struct sti_struct *def_sti;