diff options
author | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:06:11 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:06:11 -0700 |
commit | ceb1c532ba6220900e61ec7073a9234661efa450 (patch) | |
tree | b7c5b94f09a6893625bb12b7795de3d44fece450 /arch/arm/mach-omap2/io.c | |
parent | 8f5b5a41ebc750ffcc2c410371b2b4998955709e (diff) | |
parent | 00c46b3069c1ee9aa31db3057e9224685af52efa (diff) | |
download | linux-stable-ceb1c532ba6220900e61ec7073a9234661efa450.tar.gz linux-stable-ceb1c532ba6220900e61ec7073a9234661efa450.tar.bz2 linux-stable-ceb1c532ba6220900e61ec7073a9234661efa450.zip |
Merge branch 'omap_chip_remove_cleanup_3.2' of git://git.pwsan.com/linux-2.6 into cleanup
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
-rw-r--r-- | arch/arm/mach-omap2/io.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 132724c39e2a..1a13b7916554 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -341,12 +341,12 @@ void __init omap2_init_common_infrastructure(void) u8 postsetup_state; if (cpu_is_omap242x()) { - omap2xxx_powerdomains_init(); - omap2xxx_clockdomains_init(); + omap242x_powerdomains_init(); + omap242x_clockdomains_init(); omap2420_hwmod_init(); } else if (cpu_is_omap243x()) { - omap2xxx_powerdomains_init(); - omap2xxx_clockdomains_init(); + omap243x_powerdomains_init(); + omap243x_clockdomains_init(); omap2430_hwmod_init(); } else if (cpu_is_omap34xx()) { omap3xxx_powerdomains_init(); |