Commit 1831c884 authored by Domen Puncer's avatar Domen Puncer Committed by Linus Torvalds

[PATCH] remove faulty __init's from drivers/video/fbmem.c

From: Geert Uytterhoeven <geert@linux-m68k.org>

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

From: Domen Puncer <domen@coderock.org>
Signed-off-by: Maximilian Attems
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d1bbb3aa
...@@ -563,7 +563,7 @@ static inline unsigned safe_shift(unsigned d, int n) ...@@ -563,7 +563,7 @@ static inline unsigned safe_shift(unsigned d, int n)
return n < 0 ? d >> -n : d << n; 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) const struct linux_logo *logo)
{ {
struct fb_cmap palette_cmap; struct fb_cmap palette_cmap;
...@@ -597,7 +597,7 @@ static void __init fb_set_logocmap(struct fb_info *info, ...@@ -597,7 +597,7 @@ static void __init fb_set_logocmap(struct fb_info *info,
} }
} }
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, const struct linux_logo *logo,
u32 *palette) u32 *palette)
{ {
...@@ -627,7 +627,7 @@ static void __init fb_set_logo_truepalette(struct fb_info *info, ...@@ -627,7 +627,7 @@ static void __init fb_set_logo_truepalette(struct fb_info *info,
} }
} }
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, const struct linux_logo *logo,
u32 *palette) u32 *palette)
{ {
...@@ -642,7 +642,7 @@ static void __init fb_set_logo_directpalette(struct fb_info *info, ...@@ -642,7 +642,7 @@ static void __init fb_set_logo_directpalette(struct fb_info *info,
palette[i] = i << redshift | i << greenshift | i << blueshift; 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, const struct linux_logo *logo, u8 *dst,
int depth) int depth)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment