From 10c07375d00e3de86692bfa7122319114db1c670 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 15 Feb 2011 17:27:52 -0800 Subject: merge: video: tegra: fix HDMI merge issue tegra_hdmi_writel should be _tegra_hdmi_writel in this function Change-Id: I7bbd85b634cd6dbd67637db57b66559cb092c8ba Reviewed-on: http://git-master/r/19664 Reviewed-by: Varun Colbert Tested-by: Varun Colbert --- drivers/video/tegra/dc/hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c index 481ed610836f..42d0a4ae60a4 100644 --- a/drivers/video/tegra/dc/hdmi.c +++ b/drivers/video/tegra/dc/hdmi.c @@ -1165,7 +1165,7 @@ static void tegra_dc_hdmi_enable(struct tegra_dc *dc) else val |= SOR_STATE_ASY_VSYNCPOL_POS; - tegra_hdmi_writel(hdmi, val, HDMI_NV_PDISP_SOR_STATE2); + _tegra_hdmi_writel(hdmi, val, HDMI_NV_PDISP_SOR_STATE2); val = SOR_STATE_ASY_HEAD_OPMODE_AWAKE | SOR_STATE_ASY_ORMODE_NORMAL; _tegra_hdmi_writel(hdmi, val, HDMI_NV_PDISP_SOR_STATE1); -- cgit v1.2.3