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/mach-omap2/gpmc.c | |
| parent | 1e2ee2a60df5c3ab74dd1c9155fb01b5bc6f807d (diff) | |
| parent | a86c0b9867940bd0ba78f109686079b4051a463d (diff) | |
| download | linux-4fb85d35bcec842e0f20437aea277157973aa45f.tar.gz linux-4fb85d35bcec842e0f20437aea277157973aa45f.tar.bz2 linux-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/mach-omap2/gpmc.c')
| -rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 72428bd45efc..fe75656f9900 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -879,7 +879,7 @@ static int __init gpmc_init(void) BUG(); } - clk_enable(gpmc_l3_clk); + clk_prepare_enable(gpmc_l3_clk); l = gpmc_read_reg(GPMC_REVISION); printk(KERN_INFO "GPMC revision %d.%d\n", (l >> 4) & 0x0f, l & 0x0f); |