diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-09-23 17:27:43 -0600 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-09-23 17:27:43 -0600 |
| commit | 4fb85d35bcec842e0f20437aea277157973aa45f (patch) | |
| tree | d3b865af2f4066f68828806b231e4bb5b4de9ec8 /arch/arm/plat-omap/omap_device.c | |
| parent | 1e2ee2a60df5c3ab74dd1c9155fb01b5bc6f807d (diff) | |
| parent | a86c0b9867940bd0ba78f109686079b4051a463d (diff) | |
| download | olio-linux-3.10-4fb85d35bcec842e0f20437aea277157973aa45f.tar.xz olio-linux-3.10-4fb85d35bcec842e0f20437aea277157973aa45f.zip | |
Merge branch 'clock_devel_3.7' into hwmod_prcm_clock_a_3.7
Conflicts:
arch/arm/mach-omap2/clkt34xx_dpll3m2.c
arch/arm/mach-omap2/clkt_clksel.c
arch/arm/mach-omap2/clock.c
Diffstat (limited to 'arch/arm/plat-omap/omap_device.c')
| -rw-r--r-- | arch/arm/plat-omap/omap_device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index b59edb065c7..6056a622a5f 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c @@ -261,10 +261,10 @@ static void _add_clkdev(struct omap_device *od, const char *clk_alias, return; } - r = omap_clk_get_by_name(clk_name); + r = clk_get(NULL, clk_name); if (IS_ERR(r)) { dev_err(&od->pdev->dev, - "omap_clk_get_by_name for %s failed\n", clk_name); + "clk_get for %s failed\n", clk_name); return; } |