diff options
| author | Domen Puncer <domen@coderock.org> | 2004-07-28 09:09:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-28 09:09:59 -0700 |
| commit | 1831c884507a8edfa294ec67a697bce4e68903c4 (patch) | |
| tree | ce94933e018a96b8fdd57d45072e563fe6d8bb72 | |
| parent | d1bbb3aa19ec5043679ef3fbe8d11044c66fbb0f (diff) | |
[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: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/video/fbmem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 4b433683bfba..6c6feba6860e 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -563,7 +563,7 @@ static inline unsigned safe_shift(unsigned d, int 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) { struct fb_cmap palette_cmap; @@ -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, u32 *palette) { @@ -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, u32 *palette) { @@ -642,7 +642,7 @@ static void __init fb_set_logo_directpalette(struct fb_info *info, 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) { |