diff options
Diffstat (limited to 'include/linux/omapfb.h')
-rw-r--r-- | include/linux/omapfb.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/omapfb.h b/include/linux/omapfb.h index 9bdd91486b49..c0b018790f07 100644 --- a/include/linux/omapfb.h +++ b/include/linux/omapfb.h | |||
@@ -85,6 +85,9 @@ | |||
85 | #define OMAPFB_MEMTYPE_SRAM 1 | 85 | #define OMAPFB_MEMTYPE_SRAM 1 |
86 | #define OMAPFB_MEMTYPE_MAX 1 | 86 | #define OMAPFB_MEMTYPE_MAX 1 |
87 | 87 | ||
88 | #define OMAPFB_MEM_IDX_ENABLED 0x80 | ||
89 | #define OMAPFB_MEM_IDX_MASK 0x7f | ||
90 | |||
88 | enum omapfb_color_format { | 91 | enum omapfb_color_format { |
89 | OMAPFB_COLOR_RGB565 = 0, | 92 | OMAPFB_COLOR_RGB565 = 0, |
90 | OMAPFB_COLOR_YUV422, | 93 | OMAPFB_COLOR_YUV422, |
@@ -136,7 +139,7 @@ struct omapfb_plane_info { | |||
136 | __u8 enabled; | 139 | __u8 enabled; |
137 | __u8 channel_out; | 140 | __u8 channel_out; |
138 | __u8 mirror; | 141 | __u8 mirror; |
139 | __u8 reserved1; | 142 | __u8 mem_idx; |
140 | __u32 out_width; | 143 | __u32 out_width; |
141 | __u32 out_height; | 144 | __u32 out_height; |
142 | __u32 reserved2[12]; | 145 | __u32 reserved2[12]; |
@@ -253,7 +256,7 @@ struct omapfb_platform_data { | |||
253 | /* in arch/arm/plat-omap/fb.c */ | 256 | /* in arch/arm/plat-omap/fb.c */ |
254 | extern void omapfb_set_platform_data(struct omapfb_platform_data *data); | 257 | extern void omapfb_set_platform_data(struct omapfb_platform_data *data); |
255 | extern void omapfb_set_ctrl_platform_data(void *pdata); | 258 | extern void omapfb_set_ctrl_platform_data(void *pdata); |
256 | extern void omapfb_reserve_sdram(void); | 259 | extern void omapfb_reserve_sdram_memblock(void); |
257 | 260 | ||
258 | #endif | 261 | #endif |
259 | 262 | ||