arm: tegra: fb: Fix merge error

Fix manual rebase error

Change-Id: I3b2165488b11bddda271cecdc979341c130def9b
Signed-off-by: Shashank Sharma <shashanks@nvidia.com>
Reviewed-on: http://git-master/r/173554
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Winnie Hsu <whsu@nvidia.com>

drivers/video/tegra/dc/dc.c

@@ -1842,10 +1842,8 @@ static int tegra_dc_probe(struct nvhost_device *ndev,
 	disable_dc_irq(irq);
 
 	mutex_lock(&dc->lock);
-	if (dc->pdata->flags & TEGRA_DC_FLAG_ENABLED) {
-		_tegra_dc_set_default_videomode(dc);
+	if (dc->pdata->flags & TEGRA_DC_FLAG_ENABLED)
 		dc->enabled = _tegra_dc_enable(dc);
-	}
 	mutex_unlock(&dc->lock);
 
 	tegra_dc_create_debugfs(dc);