diff options
author | Adrian Bunk <bunk@stusta.de> | 2007-07-17 07:05:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 13:23:13 -0400 |
commit | 57a3db98ac88854e20780e2337471323ba63bde2 (patch) | |
tree | 9c45f6d08d77ec81b3e99723dfdb0e107e61b927 | |
parent | bce9451310eb66fbbd77bf22e8160079700691f8 (diff) |
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>
-rw-r--r-- | drivers/video/macmodes.c | 5 | ||||
-rw-r--r-- | drivers/video/macmodes.h | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/drivers/video/macmodes.c b/drivers/video/macmodes.c index ab2149531a0..083f60321ed 100644 --- a/drivers/video/macmodes.c +++ b/drivers/video/macmodes.c | |||
@@ -369,9 +369,8 @@ EXPORT_SYMBOL(mac_map_monitor_sense); | |||
369 | * | 369 | * |
370 | */ | 370 | */ |
371 | 371 | ||
372 | int __devinit mac_find_mode(struct fb_var_screeninfo *var, | 372 | int mac_find_mode(struct fb_var_screeninfo *var, struct fb_info *info, |
373 | struct fb_info *info, const char *mode_option, | 373 | const char *mode_option, unsigned int default_bpp) |
374 | unsigned int default_bpp) | ||
375 | { | 374 | { |
376 | const struct fb_videomode *db = NULL; | 375 | const struct fb_videomode *db = NULL; |
377 | unsigned int dbsize = 0; | 376 | unsigned int dbsize = 0; |
diff --git a/drivers/video/macmodes.h b/drivers/video/macmodes.h index babeb81f467..b86ba08aac9 100644 --- a/drivers/video/macmodes.h +++ b/drivers/video/macmodes.h | |||
@@ -55,10 +55,10 @@ extern int mac_vmode_to_var(int vmode, int cmode, | |||
55 | extern int mac_var_to_vmode(const struct fb_var_screeninfo *var, int *vmode, | 55 | extern int mac_var_to_vmode(const struct fb_var_screeninfo *var, int *vmode, |
56 | int *cmode); | 56 | int *cmode); |
57 | extern int mac_map_monitor_sense(int sense); | 57 | extern int mac_map_monitor_sense(int sense); |
58 | extern int __devinit mac_find_mode(struct fb_var_screeninfo *var, | 58 | extern int mac_find_mode(struct fb_var_screeninfo *var, |
59 | struct fb_info *info, | 59 | struct fb_info *info, |
60 | const char *mode_option, | 60 | const char *mode_option, |
61 | unsigned int default_bpp); | 61 | unsigned int default_bpp); |
62 | 62 | ||
63 | 63 | ||
64 | /* | 64 | /* |