diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 17:35:16 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 17:35:16 +0200 |
| commit | aee9a50c5b9e424994a58b2aefaa499623e6786a (patch) | |
| tree | bb4b4b1664fa45d4823778efa57bf677b378837c /arch/arm/mach-omap2/io.c | |
| parent | Merge tag 'omap-for-v3.11/soc-part2-signed' of git://git.kernel.org/pub/scm/l... (diff) | |
| parent | Merge tag 'omap-pm-v3.11/voltdm' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| download | linux-aee9a50c5b9e424994a58b2aefaa499623e6786a.tar.xz linux-aee9a50c5b9e424994a58b2aefaa499623e6786a.zip | |
Merge branch 'omap/pm-voltdomain-cleanup' into next/soc
Conflicts:
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/io.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index dd0f23d0085b..fe3253a100e7 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -577,7 +577,6 @@ void __init am33xx_init_early(void) omap2_set_globals_cm(AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE), NULL); omap3xxx_check_revision(); am33xx_check_features(); - am33xx_voltagedomains_init(); am33xx_powerdomains_init(); am33xx_clockdomains_init(); am33xx_hwmod_init(); |