1 files changed, 5 insertions, 16 deletions

diff --git a/drivers/video/omap/hwa742.c b/drivers/video/omap/hwa742.c
index 084aa0ac562b..9f1d23c319cb 100644
--- a/drivers/video/omap/hwa742.c
+++ b/drivers/video/omap/hwa742.c
@@ -28,7 +28,6 @@
 #include <linux/interrupt.h>
 
 #include <plat/dma.h>
-#include <plat/hwa742.h>
 #include "omapfb.h"
 
 #define HWA742_REV_CODE_REG       0x0
@@ -942,7 +941,6 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode,
         unsigned long sys_clk, pix_clk;
         int extif_mem_div;
         struct omapfb_platform_data *omapfb_conf;
-        struct hwa742_platform_data *ctrl_conf;
 
         BUG_ON(!fbdev->ext_if || !fbdev->int_ctrl);
 
@@ -951,13 +949,6 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode,
         hwa742.int_ctrl = fbdev->int_ctrl;
 
         omapfb_conf = fbdev->dev->platform_data;
-        ctrl_conf = omapfb_conf->ctrl_platform_data;
-
-        if (ctrl_conf == NULL) {
-                dev_err(fbdev->dev, "HWA742: missing platform data\n");
-                r = -ENOENT;
-                goto err1;
-        }
 
         hwa742.sys_ck = clk_get(NULL, "hwa_sys_ck");
 
@@ -995,14 +986,12 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode,
                 goto err4;
         }
 
-        if (ctrl_conf->te_connected) {
-                if ((r = setup_tearsync(pix_clk, extif_mem_div)) < 0) {
-                        dev_err(hwa742.fbdev->dev,
-                               "HWA742: can't setup tearing synchronization\n");
-                        goto err4;
-                }
-                hwa742.te_connected = 1;
+        if ((r = setup_tearsync(pix_clk, extif_mem_div)) < 0) {
+                dev_err(hwa742.fbdev->dev,
+                        "HWA742: can't setup tearing synchronization\n");
+                goto err4;
         }
+        hwa742.te_connected = 1;
 
         hwa742.max_transmit_size = hwa742.extif->max_transmit_size;