diff options
Diffstat (limited to 'include/asm-arm')
-rw-r--r-- | include/asm-arm/arch-omap/omapfb.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-arm/arch-omap/omapfb.h b/include/asm-arm/arch-omap/omapfb.h index fccdb3db025f..ce80a71ce8f7 100644 --- a/include/asm-arm/arch-omap/omapfb.h +++ b/include/asm-arm/arch-omap/omapfb.h | |||
@@ -292,8 +292,9 @@ struct omapfb_device { | |||
292 | }; | 292 | }; |
293 | 293 | ||
294 | struct omapfb_platform_data { | 294 | struct omapfb_platform_data { |
295 | struct omap_lcd_config lcd; | 295 | struct omap_lcd_config lcd; |
296 | struct omap_fbmem_config fbmem; | 296 | struct omapfb_mem_desc mem_desc; |
297 | void *ctrl_platform_data; | ||
297 | }; | 298 | }; |
298 | 299 | ||
299 | #define OMAPFB_EVENT_READY 1 | 300 | #define OMAPFB_EVENT_READY 1 |
@@ -317,8 +318,9 @@ extern int omapfb_update_window_async(struct omapfb_update_window *win, | |||
317 | void (*callback)(void *), | 318 | void (*callback)(void *), |
318 | void *callback_data); | 319 | void *callback_data); |
319 | 320 | ||
320 | /* in arch/arm/plat-omap/devices.c */ | 321 | /* in arch/arm/plat-omap/fb.c */ |
321 | extern void omapfb_reserve_mem(void); | 322 | extern void omapfb_reserve_mem(void); |
323 | extern void omapfb_set_ctrl_platform_data(void *pdata); | ||
322 | 324 | ||
323 | #endif /* __KERNEL__ */ | 325 | #endif /* __KERNEL__ */ |
324 | 326 | ||