Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / arch / arm / mach-msm / io.c

diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index d36b610..1260007 100644 (file)
--- 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),
 };
@@ -153,7 +154,7 @@ __msm_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype)
 {
        if (mtype == MT_DEVICE) {
                /* The peripherals in the 88000000 - D0000000 range
-                * are only accessable by type MT_DEVICE_NONSHARED.
+                * are only accessible by type MT_DEVICE_NONSHARED.
                 * Adjust mtype as necessary to make this "just work."
                 */
                if ((phys_addr >= 0x88000000) && (phys_addr < 0xD0000000))
@@ -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);