From: Olaf Hering <olh@suse.de>
Date: Fri, 25 Feb 2005 08:51:25 +0000 (-0800)
Subject: [PATCH] Fix incorrect __init on 'modedb[]' array
X-Git-Tag: v2.6.11~26^2~9
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=06c8faf34542bfd9ba5f8ce6dbc969dd0edc346e;p=history.git

[PATCH] Fix incorrect __init on 'modedb[]' array

modedb can not be __init because fb_find_mode() (which is not __init)
may get db == NULL.  fb_find_mode() is called from modules.

Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 951b03635356..929bbbacc9f3 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -37,7 +37,7 @@ const char *global_mode_option;
 
 #define DEFAULT_MODEDB_INDEX	0
 
-static const __init struct fb_videomode modedb[] = {
+static const struct fb_videomode modedb[] = {
     {
 	/* 640x400 @ 70 Hz, 31.5 kHz hsync */
 	NULL, 70, 640, 400, 39721, 40, 24, 39, 9, 96, 2,