diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-22 14:30:12 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-22 14:30:12 -0500 |
| commit | c10abbb26513f4ccff89c4d80912cb4d36fcd3e8 (patch) | |
| tree | b2a44e08e9e683078e9d20d6072a513798788314 /arch/arm/mach-omap2/io.c | |
| parent | 4931445b94f49672028b81ace9d4eee8ddf19ab2 (diff) | |
| parent | da1f026b532ce944d74461497dc6d8c16456466e (diff) | |
Merge branches 'devel-gpmc' and 'devel-misc' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 4605d5073a9b..5577ab2faad2 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
| @@ -347,8 +347,7 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0, | |||
| 347 | else if (cpu_is_omap44xx()) | 347 | else if (cpu_is_omap44xx()) |
| 348 | omap44xx_hwmod_init(); | 348 | omap44xx_hwmod_init(); |
| 349 | 349 | ||
| 350 | /* The OPP tables have to be registered before a clk init */ | 350 | omap_pm_if_early_init(); |
| 351 | omap_pm_if_early_init(mpu_opps, dsp_opps, l3_opps); | ||
| 352 | 351 | ||
| 353 | if (cpu_is_omap2420()) | 352 | if (cpu_is_omap2420()) |
| 354 | omap2420_clk_init(); | 353 | omap2420_clk_init(); |