| From stable-bounces@linux.kernel.org Tue Jul 17 04:15:55 2007 |
| From: Adrian Bunk <bunk@stusta.de> |
| Date: Tue, 17 Jul 2007 04:05:53 -0700 |
| Subject: drivers/video/macmodes.c:mac_find_mode() mustn't be __devinit |
| To: torvalds@linux-foundation.org |
| Cc: adaplas@pol.net, akpm@linux-foundation.org, michal.k.k.piotrowski@gmail.com, stable@kernel.org, bunk@stusta.de |
| Message-ID: <200707171105.l6HB5rQT014210@imap1.linux-foundation.org> |
| |
| |
| From: Adrian Bunk <bunk@stusta.de> |
| |
| 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> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/video/macmodes.c | 5 ++--- |
| drivers/video/macmodes.h | 8 ++++---- |
| 2 files changed, 6 insertions(+), 7 deletions(-) |
| |
| --- 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; |
| --- a/drivers/video/macmodes.h |
| +++ b/drivers/video/macmodes.h |
| @@ -55,10 +55,10 @@ extern int mac_vmode_to_var(int vmode, i |
| 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); |
| |
| |
| /* |
