Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[deliverable/linux.git] / drivers / video / macmodes.h

diff --git a/drivers/video/macmodes.h b/drivers/video/macmodes.h
index 232f5a09a499ada89c87fe27598aceb5f2d95a70..b86ba08aac9e8af086041e71668d9b207bb755ce 100644 (file)
--- a/drivers/video/macmodes.h
+++ b/drivers/video/macmodes.h
@@ -55,9 +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 __init 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);
 
 
     /*