← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-linaro-omap/trusty

« back to all changes in this revision

Viewing changes to drivers/video/omap/dispc.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-57i0gl3v99b3lkfg
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/video/omap/dispc.c
922
922
                return PTR_ERR(dispc.dss_ick);
923
923
        }
924
924
 
925
 
        dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck");
 
925
        dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "fck");
926
926
        if (IS_ERR(dispc.dss1_fck)) {
927
927
                dev_err(dispc.fbdev->dev, "can't get dss1_fck\n");
928
928
                clk_put(dispc.dss_ick);
929
929
                return PTR_ERR(dispc.dss1_fck);
930
930
        }
931
931
 
932
 
        dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "tv_fck");
 
932
        dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "tv_clk");
933
933
        if (IS_ERR(dispc.dss_54m_fck)) {
934
934
                dev_err(dispc.fbdev->dev, "can't get tv_fck\n");
935
935
                clk_put(dispc.dss_ick);