Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[karo-tx-linux.git] / include / linux / omapfb.h

diff --git a/include/linux/omapfb.h b/include/linux/omapfb.h
index 7ab9cebf9164facf87c8aabc07bd634a9ed4508c..4ff57e81051ddfd43ec696947a1bb9ecfa1eee89 100644 (file)
--- a/include/linux/omapfb.h
+++ b/include/linux/omapfb.h
@@ -222,38 +222,11 @@ struct omapfb_display_info {
 
 #include <plat/board.h>
 
-#ifdef CONFIG_ARCH_OMAP1
-#define OMAPFB_PLANE_NUM               1
-#else
-#define OMAPFB_PLANE_NUM               3
-#endif
-
-struct omapfb_mem_region {
-       u32             paddr;
-       void __iomem    *vaddr;
-       unsigned long   size;
-       u8              type;           /* OMAPFB_PLANE_MEM_* */
-       enum omapfb_color_format format;/* OMAPFB_COLOR_* */
-       unsigned        format_used:1;  /* Must be set when format is set.
-                                        * Needed b/c of the badly chosen 0
-                                        * base for OMAPFB_COLOR_* values
-                                        */
-       unsigned        alloc:1;        /* allocated by the driver */
-       unsigned        map:1;          /* kernel mapped by the driver */
-};
-
-struct omapfb_mem_desc {
-       int                             region_cnt;
-       struct omapfb_mem_region        region[OMAPFB_PLANE_NUM];
-};
-
 struct omapfb_platform_data {
        struct omap_lcd_config          lcd;
-       struct omapfb_mem_desc          mem_desc;
 };
 
-/* in arch/arm/plat-omap/fb.c */
-extern void omapfb_set_platform_data(struct omapfb_platform_data *data);
+void __init omapfb_set_lcd_config(const struct omap_lcd_config *config);
 
 #endif