3 files changed, 3 insertions, 7 deletions

diff --git a/include/video/da8xx-fb.h b/include/video/da8xx-fb.h
index 6316cdabf73f..89d43b3d4cb9 100644
--- a/include/video/da8xx-fb.h
+++ b/include/video/da8xx-fb.h
@@ -99,7 +99,6 @@ struct lcd_sync_arg {
 #define FBIPUT_COLOR            _IOW('F', 6, int)
 #define FBIPUT_HSYNC            _IOW('F', 9, int)
 #define FBIPUT_VSYNC            _IOW('F', 10, int)
-#define FBIO_WAITFORVSYNC       _IOW('F', 0x20, u_int32_t)
 
 #endif  /* ifndef DA8XX_FB_H */
 
diff --git a/include/video/s1d13xxxfb.h b/include/video/s1d13xxxfb.h
index f0736cff2ca3..55f534491a3d 100644
--- a/include/video/s1d13xxxfb.h
+++ b/include/video/s1d13xxxfb.h
@@ -136,12 +136,6 @@
 #define S1DREG_DELAYOFF                 0xFFFE
 #define S1DREG_DELAYON                  0xFFFF
 
-#define BBLT_FIFO_EMPTY                 0x00
-#define BBLT_FIFO_NOT_EMPTY             0x40
-#define BBLT_FIFO_NOT_FULL              0x30
-#define BBLT_FIFO_HALF_FULL             0x20
-#define BBLT_FIFO_FULL                  0x10
-
 #define BBLT_SOLID_FILL                 0x0c
 
 
diff --git a/include/video/sh_mobile_hdmi.h b/include/video/sh_mobile_hdmi.h
index 1e1aa54ab2e4..b56932927d0a 100644
--- a/include/video/sh_mobile_hdmi.h
+++ b/include/video/sh_mobile_hdmi.h
@@ -13,6 +13,7 @@
 
 struct sh_mobile_lcdc_chan_cfg;
 struct device;
+struct clk;
 
 /*
  * flags format
@@ -33,6 +34,8 @@ struct sh_mobile_hdmi_info {
         struct sh_mobile_lcdc_chan_cfg  *lcd_chan;
         struct device                   *lcd_dev;
         unsigned int                     flags;
+        long (*clk_optimize_parent)(unsigned long target, unsigned long *best_freq,
+                                    unsigned long *parent_freq);
 };
 
 #endif