diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /arch/arm/mach-msm/timer.c | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'arch/arm/mach-msm/timer.c')
| -rw-r--r-- | arch/arm/mach-msm/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c index 2bffe9b7e9fe..345a14cb73c3 100644 --- a/arch/arm/mach-msm/timer.c +++ b/arch/arm/mach-msm/timer.c | |||
| @@ -45,7 +45,7 @@ struct msm_clock { | |||
| 45 | struct clock_event_device clockevent; | 45 | struct clock_event_device clockevent; |
| 46 | struct clocksource clocksource; | 46 | struct clocksource clocksource; |
| 47 | struct irqaction irq; | 47 | struct irqaction irq; |
| 48 | uint32_t regbase; | 48 | void __iomem *regbase; |
| 49 | uint32_t freq; | 49 | uint32_t freq; |
| 50 | uint32_t shift; | 50 | uint32_t shift; |
| 51 | }; | 51 | }; |