Merge branch 'net-phy-remove-genphy_config_init'

[linux.git] / include / video / omapfb_dss.h

diff --git a/include/video/omapfb_dss.h b/include/video/omapfb_dss.h
index a167b839eccb98f10afd3570c57ca7be19cf4185..e8eaac2cb7b85043c19ba7b9bfc42f7377e01eb1 100644 (file)
--- a/include/video/omapfb_dss.h
+++ b/include/video/omapfb_dss.h
@@ -114,11 +114,6 @@ enum omap_dss_trans_key_type {
        OMAP_DSS_COLOR_KEY_VID_SRC = 1,
 };
 
-enum omap_rfbi_te_mode {
-       OMAP_DSS_RFBI_TE_MODE_1 = 1,
-       OMAP_DSS_RFBI_TE_MODE_2 = 2,
-};
-
 enum omap_dss_signal_level {
        OMAPDSS_SIG_ACTIVE_LOW,
        OMAPDSS_SIG_ACTIVE_HIGH,
@@ -189,27 +184,6 @@ enum omap_dss_output_id {
        OMAP_DSS_OUTPUT_HDMI    = 1 << 6,
 };
 
-/* RFBI */
-
-struct rfbi_timings {
-       int cs_on_time;
-       int cs_off_time;
-       int we_on_time;
-       int we_off_time;
-       int re_on_time;
-       int re_off_time;
-       int we_cycle_time;
-       int re_cycle_time;
-       int cs_pulse_width;
-       int access_time;
-
-       int clk_div;
-
-       u32 tim[5];             /* set by rfbi_convert_timings() */
-
-       int converted;
-};
-
 /* DSI */
 
 enum omap_dss_dsi_trans_mode {
@@ -640,11 +614,6 @@ struct omap_dss_device {
                        u8 data_lines;
                } dpi;
 
-               struct {
-                       u8 channel;
-                       u8 data_lines;
-               } rfbi;
-
                struct {
                        u8 datapairs;
                } sdi;
@@ -668,7 +637,6 @@ struct omap_dss_device {
 
        struct {
                u8 pixel_size;
-               struct rfbi_timings rfbi_timings;
        } ctrl;
 
        const char *name;