Merge branch 'linus' into idle-test

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index d36b61074146..800f327a7ecc 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -105,6 +105,7 @@ static struct map_desc msm8x60_io_desc[] __initdata = {
         MSM_DEVICE(QGIC_DIST),
         MSM_DEVICE(QGIC_CPU),
         MSM_DEVICE(TMR),
+        MSM_DEVICE(TMR0),
         MSM_DEVICE(ACC),
         MSM_DEVICE(GCC),
 };
@@ -163,3 +164,4 @@ __msm_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype)
         return __arm_ioremap_caller(phys_addr, size, mtype,
                 __builtin_return_address(0));
 }
+EXPORT_SYMBOL(__msm_ioremap);