diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 00:27:54 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 00:27:59 +0100 |
commit | 73829af71fdb8655e7ba4b5a2a6612ad34a75a11 (patch) | |
tree | 4277605ab142a4f02ff4efad9a7fe522054b7a7f /arch/arm/mach-omap2/io.c | |
parent | Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/... (diff) | |
parent | ARM: move VMALLOC_END down temporarily for shmobile (diff) | |
download | linux-73829af71fdb8655e7ba4b5a2a6612ad34a75a11.tar.xz linux-73829af71fdb8655e7ba4b5a2a6612ad34a75a11.zip |
Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable
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 8907c4ac1767..3f565dd2ea8d 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -319,7 +319,6 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data) static void __init omap_common_init_early(void) { omap2_check_revision(); - omap_ioremap_init(); omap_init_consistent_dma_size(); } |