From 6792a3f47a2e42d7164292bf7f1a55cfc4c91652 Mon Sep 17 00:00:00 2001
From: Anton Arapov <anton@redhat.com>
Date: Fri, 8 Jun 2012 12:58:00 +0200
Subject: fedora kernel: b920e9b748c595f970bf80ede7832d39f8d567da

Signed-off-by: Anton Arapov <anton@redhat.com>
---
 arch/arm/mach-msm/board-trout.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'arch/arm/mach-msm/board-trout.c')

diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
index 6b9b227c87c..d4060a37e23 100644
--- a/arch/arm/mach-msm/board-trout.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -19,6 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/clkdev.h>
 
+#include <asm/system_info.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -43,6 +44,11 @@ static struct platform_device *devices[] __initdata = {
 
 extern struct sys_timer msm_timer;
 
+static void __init trout_init_early(void)
+{
+	arch_ioremap_caller = __msm_ioremap_caller;
+}
+
 static void __init trout_init_irq(void)
 {
 	msm_init_irq();
@@ -96,6 +102,7 @@ MACHINE_START(TROUT, "HTC Dream")
 	.atag_offset	= 0x100,
 	.fixup		= trout_fixup,
 	.map_io		= trout_map_io,
+	.init_early	= trout_init_early,
 	.init_irq	= trout_init_irq,
 	.init_machine	= trout_init,
 	.timer		= &msm_timer,
-- 
cgit