diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-02-15 17:27:52 -0800 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-02-16 14:38:33 -0800 |
| commit | 10c07375d00e3de86692bfa7122319114db1c670 (patch) | |
| tree | 6f81dc5ad89e35050121863f0cc347d3d76d9c24 /drivers | |
| parent | 015a2817ef273b6540eae4ed2be7d9c4d596cbef (diff) | |
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 <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/tegra/dc/hdmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |