From a816fc0e7c38582e43ba89f5968d6804160a6057 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Tue, 27 Dec 2011 22:55:49 +0100
Subject: [PATCH] --- yaml --- r: 284881 b: refs/heads/master c:
 c5627f65d6b860023f8ee985df61c20617dd21b5 h: refs/heads/master i:   284879:
 fa3988bffae2024f59e1ed22f635c153b91661a1 v: v3

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

diff --git a/[refs] b/[refs]
index 737d415ee594..14a4f5c3ea39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2f55b54556ae6a3a365afead6bc8e46a2013d7f
+refs/heads/master: c5627f65d6b860023f8ee985df61c20617dd21b5
diff --git a/trunk/drivers/video/grvga.c b/trunk/drivers/video/grvga.c
index f37e02538203..da066c210923 100644
--- a/trunk/drivers/video/grvga.c
+++ b/trunk/drivers/video/grvga.c
@@ -70,7 +70,7 @@ static const struct fb_videomode grvga_modedb[] = {
     }
  };
 
-static struct fb_fix_screeninfo grvga_fix __initdata = {
+static struct fb_fix_screeninfo grvga_fix __devinitdata = {
 	.id =		"AG SVGACTRL",
 	.type =		FB_TYPE_PACKED_PIXELS,
 	.visual =       FB_VISUAL_PSEUDOCOLOR,
@@ -267,7 +267,7 @@ static struct fb_ops grvga_ops = {
 	.fb_imageblit	= cfb_imageblit
 };
 
-static int __init grvga_parse_custom(char *options,
+static int __devinit grvga_parse_custom(char *options,
 				     struct fb_var_screeninfo *screendata)
 {
 	char *this_opt;