diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-17 16:14:01 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-17 16:14:01 +0000 |
| commit | 94bd217e2d683719ab21a4ac117d8a1b91cbedc9 (patch) | |
| tree | f2d506818cc1643ca816f609518ab5d1cdb28e66 /drivers/video/omap/dispc.c | |
| parent | 5dd72f12df00cbabc16de770b79b17ced63138be (diff) | |
| parent | 93ee7a9340d64f20295aacc3fb6a22b759323280 (diff) | |
| download | op-kernel-dev-94bd217e2d683719ab21a4ac117d8a1b91cbedc9.zip op-kernel-dev-94bd217e2d683719ab21a4ac117d8a1b91cbedc9.tar.gz | |
Merge commit 'v3.1-rc2' into HEAD
Diffstat (limited to 'drivers/video/omap/dispc.c')
| -rw-r--r-- | drivers/video/omap/dispc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c index 5294834..0ccd7ad 100644 --- a/drivers/video/omap/dispc.c +++ b/drivers/video/omap/dispc.c @@ -922,14 +922,14 @@ static int get_dss_clocks(void) return PTR_ERR(dispc.dss_ick); } - dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck"); + dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "fck"); if (IS_ERR(dispc.dss1_fck)) { dev_err(dispc.fbdev->dev, "can't get dss1_fck\n"); clk_put(dispc.dss_ick); return PTR_ERR(dispc.dss1_fck); } - dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "tv_fck"); + dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "tv_clk"); if (IS_ERR(dispc.dss_54m_fck)) { dev_err(dispc.fbdev->dev, "can't get tv_fck\n"); clk_put(dispc.dss_ick); |
