Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 57a3db98ac88854e20780e2337471323ba63bde2

Authored by Adrian Bunk
Committed by Linus Torvalds
1 parent bce9451310
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 2 changed files with 6 additions and 7 deletions Side-by-side Diff

drivers/video/macmodes.c
Diff comments   View file @ 57a3db9
... ... @@ -369,9 +369,8 @@
369 369 *
370 370 */
371 371  
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)
375 374 {
376 375 const struct fb_videomode *db = NULL;
377 376 unsigned int dbsize = 0;
drivers/video/macmodes.h
Diff comments   View file @ 57a3db9
... ... @@ -55,10 +55,10 @@
55 55 extern int mac_var_to_vmode(const struct fb_var_screeninfo *var, int *vmode,
56 56 int *cmode);
57 57 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);
62 62  
63 63  
64 64 /*