From: Andrew Morton <akpm@linux-foundation.org>

Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/video/console/fbcon.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/video/console/fbcon.h~fbcon-replace-mono_col-macro-with-static-inline-fix drivers/video/console/fbcon.h
--- a/drivers/video/console/fbcon.h~fbcon-replace-mono_col-macro-with-static-inline-fix
+++ a/drivers/video/console/fbcon.h
@@ -105,7 +105,7 @@ struct fbcon_ops {
 	((s) & 0x8000)
 	
 
-static inline int mono_col(struct fb_info *info)
+static inline int mono_col(const struct fb_info *info)
 {
 	__u32 max_len;
 	max_len = max(info->var.green.length, info->var.red.length);
_