[Kernel-janitors] [patch 2.6.6] remove faulty __init's from

[Kernel-janitors] [patch 2.6.6] remove faulty __init's from

[Domen Puncer]

[-- Attachment #1: Type: text/plain, Size: 1377 bytes --]

Hi.

These four are called from fb_show_logo, which is exported symbol,
called by fbcon_switch.

Compile tested.


	Domen

--- c/drivers/video/fbmem.c	2004-05-10 14:16:10.000000000 +0200
+++ a/drivers/video/fbmem.c	2004-05-17 19:48:37.000000000 +0200
@@ -509,7 +509,7 @@ static inline unsigned safe_shift(unsign
 	return n < 0 ? d >> -n : d << n;
 }
 
-static void __init fb_set_logocmap(struct fb_info *info,
+static void fb_set_logocmap(struct fb_info *info,
 				   const struct linux_logo *logo)
 {
 	struct fb_cmap palette_cmap;
@@ -543,7 +543,7 @@ static void __init fb_set_logocmap(struc
 	}
 }
 
-static void  __init fb_set_logo_truepalette(struct fb_info *info,
+static void  fb_set_logo_truepalette(struct fb_info *info,
 					    const struct linux_logo *logo,
 					    u32 *palette)
 {
@@ -573,7 +573,7 @@ static void  __init fb_set_logo_truepale
 	}
 }
 
-static void __init fb_set_logo_directpalette(struct fb_info *info,
+static void fb_set_logo_directpalette(struct fb_info *info,
 					     const struct linux_logo *logo,
 					     u32 *palette)
 {
@@ -588,7 +588,7 @@ static void __init fb_set_logo_directpal
 		palette[i] = i << redshift | i << greenshift | i << blueshift;
 }
 
-static void __init fb_set_logo(struct fb_info *info,
+static void fb_set_logo(struct fb_info *info,
 			       const struct linux_logo *logo, u8 *dst,
 			       int depth)
 {

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors