Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/video/macmodes.c

+2 −3
Original line number Diff line number Diff line
@@ -369,9 +369,8 @@ EXPORT_SYMBOL(mac_map_monitor_sense); 
 *

 */



int __devinit mac_find_mode(struct fb_var_screeninfo *var,

			    struct fb_info *info, const char *mode_option,

			    unsigned int default_bpp)

int mac_find_mode(struct fb_var_screeninfo *var, struct fb_info *info,

		  const char *mode_option, unsigned int default_bpp)

{

    const struct fb_videomode *db = NULL;

    unsigned int dbsize = 0;

drivers/video/macmodes.h

+4 −4
Original line number Diff line number Diff line
@@ -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,

			    int *cmode);

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,

			 const char *mode_option,

			 unsigned int default_bpp);