diff --git a/[refs] b/[refs] index ee9e059035d7..87eff371f71c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ede365aa6f74428a1f69c21ca1cf21213167576 +refs/heads/master: df5d3ed23cf73ee0763a8963003bda9b69d9620f diff --git a/trunk/drivers/video/omap2/dss/hdmi.c b/trunk/drivers/video/omap2/dss/hdmi.c index 635cc002a438..256f27a9064a 100644 --- a/trunk/drivers/video/omap2/dss/hdmi.c +++ b/trunk/drivers/video/omap2/dss/hdmi.c @@ -1698,9 +1698,9 @@ static int hdmi_get_clocks(struct platform_device *pdev) hdmi.sys_clk = clk; - clk = clk_get(&pdev->dev, "fck"); + clk = clk_get(&pdev->dev, "dss_48mhz_clk"); if (IS_ERR(clk)) { - DSSERR("can't get fck\n"); + DSSERR("can't get hdmi_clk\n"); clk_put(hdmi.sys_clk); return PTR_ERR(clk); }