Commit 57a3db98 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

drivers/video/macmodes.c:mac_find_mode() mustn't be __devinit

If it's EXPORT_SYMBOL'ed it can't be __devinit.

Reported by Mikael Pettersson.
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bce94513
...@@ -369,9 +369,8 @@ EXPORT_SYMBOL(mac_map_monitor_sense); ...@@ -369,9 +369,8 @@ EXPORT_SYMBOL(mac_map_monitor_sense);
* *
*/ */
int __devinit mac_find_mode(struct fb_var_screeninfo *var, int mac_find_mode(struct fb_var_screeninfo *var, struct fb_info *info,
struct fb_info *info, const char *mode_option, const char *mode_option, unsigned int default_bpp)
unsigned int default_bpp)
{ {
const struct fb_videomode *db = NULL; const struct fb_videomode *db = NULL;
unsigned int dbsize = 0; unsigned int dbsize = 0;
......
...@@ -55,7 +55,7 @@ extern int mac_vmode_to_var(int vmode, int cmode, ...@@ -55,7 +55,7 @@ extern int mac_vmode_to_var(int vmode, int cmode,
extern int mac_var_to_vmode(const struct fb_var_screeninfo *var, int *vmode, extern int mac_var_to_vmode(const struct fb_var_screeninfo *var, int *vmode,
int *cmode); int *cmode);
extern int mac_map_monitor_sense(int sense); extern int mac_map_monitor_sense(int sense);
extern int __devinit mac_find_mode(struct fb_var_screeninfo *var, extern int mac_find_mode(struct fb_var_screeninfo *var,
struct fb_info *info, struct fb_info *info,
const char *mode_option, const char *mode_option,
unsigned int default_bpp); unsigned int default_bpp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment