ARM: OMAP: Merge driver headers from N800 tree

[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..93a58e7862b050f6512d8249979e1b87caf083d4 100644 (file)
--- a/include/asm-arm/arch-s3c2410/fb.h
+++ b/include/asm-arm/arch-s3c2410/fb.h
@@ -1,4 +1,4 @@
-/* linux/include/asm/arch-s3c2410/fb.h
+/* linux/include/asm-arm/arch-s3c2410/fb.h
  *
  * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org>
  *
@@ -7,12 +7,6 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- *
- *  Changelog:
- *     07-Sep-2004     RTP     Created file
- *     03-Nov-2004     BJD     Updated and minor cleanups
- *     03-Aug-2005     RTP     Renamed to fb.h
 */
 
 #ifndef __ASM_ARM_FB_H
@@ -37,6 +31,9 @@ struct s3c2410fb_hw {
 struct s3c2410fb_mach_info {
        unsigned char   fixed_syncs;    /* do not update sync/border */
 
+       /* LCD types */
+       int             type;
+
        /* Screen size */
        int             width;
        int             height;
@@ -64,6 +61,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 */