From 224a4451ace99a2bb769144e262865d22e09acc5 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Tue, 10 Aug 2010 18:02:29 -0700
Subject: [PATCH] --- yaml --- r: 208482 b: refs/heads/master c:
 da909ce4c0df482a43e1e8c827a7d2f169973736 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/video/console/fbcon.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f23a51fd3040..25c392bab674 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec81c9cc2f58a3a9f9637c390ea83efe9f91abf7
+refs/heads/master: da909ce4c0df482a43e1e8c827a7d2f169973736
diff --git a/trunk/drivers/video/console/fbcon.c b/trunk/drivers/video/console/fbcon.c
index 26bf7cbfecc2..84f842331dfa 100644
--- a/trunk/drivers/video/console/fbcon.c
+++ b/trunk/drivers/video/console/fbcon.c
@@ -287,7 +287,7 @@ static inline int fbcon_is_inactive(struct vc_data *vc, struct fb_info *info)
 		!vt_force_oops_output(vc);
 }
 
-static inline int get_color(struct vc_data *vc, struct fb_info *info,
+static int get_color(struct vc_data *vc, struct fb_info *info,
 	      u16 c, int is_fg)
 {
 	int depth = fb_get_color_depth(&info->var, &info->fix);