[patch-kj] remove faulty __init's from drivers/video/fbmem.c

[patch-kj] remove faulty __init's from drivers/video/fbmem.c

[maximilian attems]

Hi.

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

Compile tested.

	Domen

patch is against 2.6.7-bk20, please tell if you need against newer.

From: Domen Puncer <domen@coderock.org>
Signed-off-by: Maximilian Attems



---

 linux-2.6.7-bk20-max/drivers/video/fbmem.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff -puN drivers/video/fbmem.c~faulty-inits-fbmem drivers/video/fbmem.c
--- linux-2.6.7-bk20/drivers/video/fbmem.c~faulty-inits-fbmem	2004-07-11 14:40:42.000000000 +0200
+++ linux-2.6.7-bk20-max/drivers/video/fbmem.c	2004-07-11 14:40:42.000000000 +0200
@@ -563,7 +563,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;
@@ -597,7 +597,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)
 {
@@ -627,7 +627,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)
 {
@@ -642,7 +642,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)
 {



-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click