summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/io.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2013-06-18 01:08:39 -0700
committerTony Lindgren <tony@atomide.com>2013-06-18 01:08:39 -0700
commit8bfdfc87dc3d00eb2f33e972b4177c36ca0e3d54 (patch)
treea0c4bbe9983e598ed4c6acab8157dfa30b5204f5 /arch/arm/mach-omap2/io.c
parent7d132055814ef17a6c7b69f342244c410a5e000f (diff)
parent63b0420c85096d4bb1a3ba365dbf6b970a58b8f7 (diff)
downloadop-kernel-dev-8bfdfc87dc3d00eb2f33e972b4177c36ca0e3d54.zip
op-kernel-dev-8bfdfc87dc3d00eb2f33e972b4177c36ca0e3d54.tar.gz
Merge tag 'omap-pm-v3.11/voltdm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.11/pm-voltdomain
OMAP: PM: remove requirement for voltage domain data; remove dummy data
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
-rw-r--r--arch/arm/mach-omap2/io.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 09abf99..50b93df 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();
ti81xx_check_features();
- am33xx_voltagedomains_init();
am33xx_powerdomains_init();
am33xx_clockdomains_init();
am33xx_hwmod_init();
OpenPOWER on IntegriCloud