diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2009-11-24 00:49:36 +0300 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2009-11-24 00:49:36 +0300 |
| commit | 2cfcadde83b308240690ff1c18f117d8bc7a08b0 (patch) | |
| tree | aa0795966d070d1f7a5221232d9ba47744bddb5f /arch/arm/mach-omap2/io.c | |
| parent | e91edcf5a2940bb7f1f316c871dfe9e2aaf9d6d9 (diff) | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
| download | linux-2cfcadde83b308240690ff1c18f117d8bc7a08b0.tar.xz | |
Merge commit 'v2.6.32-rc8'
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index e3a3bad1d84f..56be87d13edb 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -302,7 +302,9 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0, pwrdm_init(powerdomains_omap); clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps); omap2_clk_init(); +#endif omap_serial_early_init(); +#ifndef CONFIG_ARCH_OMAP4 omap_hwmod_late_init(); omap_pm_if_init(); omap2_sdrc_init(sdrc_cs0, sdrc_cs1); |