From f8eefbe6516df14cf9623bef19f39d45c98b7085 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Sat, 21 Jul 2007 04:37:31 -0700
Subject: [PATCH] --- yaml --- r: 62314 b: refs/heads/master c:
 80e27982a66ea8306a704ba8bdf634ed480d4b46 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7b1d3967e88e..6d6e1e50a66c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e63516c826454c964eefdd24d33e188064c6679
+refs/heads/master: 80e27982a66ea8306a704ba8bdf634ed480d4b46
diff --git a/trunk/drivers/video/console/vgacon.c b/trunk/drivers/video/console/vgacon.c
index f46fe95f69fb..d18b73aafa0d 100644
--- a/trunk/drivers/video/console/vgacon.c
+++ b/trunk/drivers/video/console/vgacon.c
@@ -187,7 +187,11 @@ static void vgacon_scrollback_init(int pitch)
 	}
 }
 
-static void vgacon_scrollback_startup(void)
+/*
+ * Called only duing init so call of alloc_bootmen is ok.
+ * Marked __init_refok to silence modpost.
+ */
+static void __init_refok vgacon_scrollback_startup(void)
 {
 	vgacon_scrollback = alloc_bootmem(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE
 					  * 1024);