Skip to content

Commit 57a3db9

Browse files
AdrianBunkLinus Torvalds
authored andcommitted
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: Adrian Bunk <[email protected]> Cc: "Antonino A. Daplas" <[email protected]> Cc: Michal Piotrowski <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent bce9451 commit 57a3db9

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

drivers/video/macmodes.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,9 +369,8 @@ EXPORT_SYMBOL(mac_map_monitor_sense);
369369
*
370370
*/
371371

372-
int __devinit mac_find_mode(struct fb_var_screeninfo *var,
373-
struct fb_info *info, const char *mode_option,
374-
unsigned int default_bpp)
372+
int mac_find_mode(struct fb_var_screeninfo *var, struct fb_info *info,
373+
const char *mode_option, unsigned int default_bpp)
375374
{
376375
const struct fb_videomode *db = NULL;
377376
unsigned int dbsize = 0;

drivers/video/macmodes.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ extern int mac_vmode_to_var(int vmode, int cmode,
5555
extern int mac_var_to_vmode(const struct fb_var_screeninfo *var, int *vmode,
5656
int *cmode);
5757
extern int mac_map_monitor_sense(int sense);
58-
extern int __devinit mac_find_mode(struct fb_var_screeninfo *var,
59-
struct fb_info *info,
60-
const char *mode_option,
61-
unsigned int default_bpp);
58+
extern int mac_find_mode(struct fb_var_screeninfo *var,
59+
struct fb_info *info,
60+
const char *mode_option,
61+
unsigned int default_bpp);
6262

6363

6464
/*

0 commit comments

Comments
 (0)