karo: cleanup after merge of v2015.10-rc2

[karo-tx-uboot.git] / arch / arm / include / asm / arch-am33xx / da8xx-fb.h

diff --git a/arch/arm/include/asm/arch-am33xx/da8xx-fb.h b/arch/arm/include/asm/arch-am33xx/da8xx-fb.h
index 208b2320e38377be9036ffb1ce33315dc2bd6cc0..a4220c321ea8ea05f88bc329af3bde1fe3a58033 100644 (file)
--- a/arch/arm/include/asm/arch-am33xx/da8xx-fb.h
+++ b/arch/arm/include/asm/arch-am33xx/da8xx-fb.h
@@ -29,7 +29,8 @@
 #define DA8XX_FB_H
 
 enum panel_type {
-       QVGA = 0
+       QVGA,
+       WVGA,
 };
 
 enum panel_shade {
@@ -121,6 +122,7 @@ struct lcd_sync_arg {
 };
 
 void da8xx_fb_disable(void);
-void da8xx_video_init(const struct da8xx_panel *panel, int bits_pixel);
+void da8xx_video_init(const struct da8xx_panel *panel,
+               const struct lcd_ctrl_config *lcd_cfg, int bits_pixel);
 
 #endif  /* ifndef DA8XX_FB_H */