[PATCH 4/7] fbdev: move logo externs to header file
From: Geert Uytterhoeven <hidden>
Date: 2007-01-31 12:44:43
Also in:
lkml
Move the external declarations for the various linux logo structures to <linux/linux_logo.h>. As a consequence, I had to remove the `const', as `const' is incompatible with `__initdata'. Signed-off-by: Geert Uytterhoeven <redacted> --- arch/powerpc/kernel/prom_init.c | 3 --- drivers/video/logo/logo.c | 13 ------------- include/linux/linux_logo.h | 13 +++++++++++++ 3 files changed, 13 insertions(+), 16 deletions(-)
--- ps3-linux-2.6.20-rc7.orig/arch/powerpc/kernel/prom_init.c
+++ ps3-linux-2.6.20-rc7/arch/powerpc/kernel/prom_init.c@@ -44,10 +44,7 @@ #include <asm/sections.h> #include <asm/machdep.h> -#ifdef CONFIG_LOGO_LINUX_CLUT224 #include <linux/linux_logo.h> -extern const struct linux_logo logo_linux_clut224; -#endif /* * Properties whose value is longer than this get excluded from our --- ps3-linux-2.6.20-rc7.orig/drivers/video/logo/logo.c +++ ps3-linux-2.6.20-rc7/drivers/video/logo/logo.c
@@ -21,19 +21,6 @@ #include <asm/bootinfo.h> #endif -extern const struct linux_logo logo_linux_mono; -extern const struct linux_logo logo_linux_vga16; -extern const struct linux_logo logo_linux_clut224; -extern const struct linux_logo logo_dec_clut224; -extern const struct linux_logo logo_mac_clut224; -extern const struct linux_logo logo_parisc_clut224; -extern const struct linux_logo logo_sgi_clut224; -extern const struct linux_logo logo_sun_clut224; -extern const struct linux_logo logo_superh_mono; -extern const struct linux_logo logo_superh_vga16; -extern const struct linux_logo logo_superh_clut224; -extern const struct linux_logo logo_m32r_clut224; - const struct linux_logo *fb_find_logo(int depth) { --- ps3-linux-2.6.20-rc7.orig/include/linux/linux_logo.h +++ ps3-linux-2.6.20-rc7/include/linux/linux_logo.h
@@ -32,6 +32,19 @@ struct linux_logo { const unsigned char *data; }; +extern struct linux_logo logo_linux_mono; +extern struct linux_logo logo_linux_vga16; +extern struct linux_logo logo_linux_clut224; +extern struct linux_logo logo_dec_clut224; +extern struct linux_logo logo_mac_clut224; +extern struct linux_logo logo_parisc_clut224; +extern struct linux_logo logo_sgi_clut224; +extern struct linux_logo logo_sun_clut224; +extern struct linux_logo logo_superh_mono; +extern struct linux_logo logo_superh_vga16; +extern struct linux_logo logo_superh_clut224; +extern struct linux_logo logo_m32r_clut224; + extern const struct linux_logo *fb_find_logo(int depth); #endif /* _LINUX_LINUX_LOGO_H */
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- Sony Network and Software Technology Center Europe (NSCE)
Geert.Uytterhoeven@sonycom.com ------- The Corporate Village, Da Vincilaan 7-D1
Voice +32-2-7008453 Fax +32-2-7008622 ---------------- B-1935 Zaventem, Belgium
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV