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 <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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/video/macmodes.c b/drivers/video/macmodes.c
index ab2149531a0413e596d43009a6d3c9d26bc4ab3d..083f60321ed857dca7c9e5632d770e930f6270bd 100644 (file)
--- a/drivers/video/macmodes.c
+++ b/drivers/video/macmodes.c
@@ -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;

diff --git a/drivers/video/macmodes.h b/drivers/video/macmodes.h
index babeb81f467d29d42786c683682043cfeaee94a5..b86ba08aac9e8af086041e71668d9b207bb755ce 100644 (file)
--- a/drivers/video/macmodes.h
+++ b/drivers/video/macmodes.h
@@ -55,10 +55,10 @@ 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,
-                                  struct fb_info *info,
-                                  const char *mode_option,
-                                  unsigned int default_bpp);
+extern int mac_find_mode(struct fb_var_screeninfo *var,
+                        struct fb_info *info,
+                        const char *mode_option,
+                        unsigned int default_bpp);
 
 
     /*