Commit b009a1c6 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] fbdev build fix

- fb_prepare_logo() is calling the undefined find_logo().  I think it wants
  fb_find_logo().

- fb_prepare_logo is not __init, therefore fb_find_logo() cannot be __init.
parent 34221611
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <linux/mman.h> #include <linux/mman.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/linux_logo.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#ifdef CONFIG_KMOD #ifdef CONFIG_KMOD
#include <linux/kmod.h> #include <linux/kmod.h>
...@@ -655,7 +656,7 @@ int fb_prepare_logo(struct fb_info *info) ...@@ -655,7 +656,7 @@ int fb_prepare_logo(struct fb_info *info)
} }
/* Return if no suitable logo was found */ /* Return if no suitable logo was found */
fb_logo.logo = find_logo(info->var.bits_per_pixel); fb_logo.logo = fb_find_logo(info->var.bits_per_pixel);
if (!fb_logo.logo || fb_logo.logo->height > info->var.yres) { if (!fb_logo.logo || fb_logo.logo->height > info->var.yres) {
fb_logo.logo = NULL; fb_logo.logo = NULL;
......
...@@ -33,7 +33,7 @@ extern const struct linux_logo logo_superh_vga16; ...@@ -33,7 +33,7 @@ extern const struct linux_logo logo_superh_vga16;
extern const struct linux_logo logo_superh_clut224; extern const struct linux_logo logo_superh_clut224;
const struct linux_logo * __init find_logo(int depth) const struct linux_logo *fb_find_logo(int depth)
{ {
const struct linux_logo *logo = 0; const struct linux_logo *logo = 0;
......
...@@ -32,6 +32,6 @@ struct linux_logo { ...@@ -32,6 +32,6 @@ struct linux_logo {
const unsigned char *data; const unsigned char *data;
}; };
extern const struct linux_logo * __init find_logo(int depth); extern const struct linux_logo *fb_find_logo(int depth);
#endif /* _LINUX_LINUX_LOGO_H */ #endif /* _LINUX_LINUX_LOGO_H */
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