Merge branches 'sh/serial-rework' and 'sh/oprofile'

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

diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index 2bffe9b..345a14c 100644 (file)
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -45,7 +45,7 @@ struct msm_clock {
        struct clock_event_device   clockevent;
        struct clocksource          clocksource;
        struct irqaction            irq;
-       uint32_t                    regbase;
+       void __iomem                *regbase;
        uint32_t                    freq;
        uint32_t                    shift;
 };