Merge branch 'master'

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-s3c2410 / fb.h

diff --git a/include/asm-arm/arch-s3c2410/fb.h b/include/asm-arm/arch-s3c2410/fb.h
index ac57bc887d82ff793a42b373fc931f39fab2d39d..4790491ba9d0b71de50e96635859181fed4e4b9a 100644 (file)
--- a/include/asm-arm/arch-s3c2410/fb.h
+++ b/include/asm-arm/arch-s3c2410/fb.h
@@ -13,6 +13,7 @@
  *     07-Sep-2004     RTP     Created file
  *     03-Nov-2004     BJD     Updated and minor cleanups
  *     03-Aug-2005     RTP     Renamed to fb.h
+ *     26-Oct-2005     BJD     Changed name of platdata init
 */
 
 #ifndef __ASM_ARM_FB_H
@@ -64,6 +65,6 @@ struct s3c2410fb_mach_info {
        unsigned long   lpcsel;
 };
 
-void __init set_s3c2410fb_info(struct s3c2410fb_mach_info *hard_s3c2410fb_info);
+extern void __init s3c24xx_fb_set_platdata(struct s3c2410fb_mach_info *);
 
 #endif /* __ASM_ARM_FB_H */