diff options
author | Tony Lindgren <tony@atomide.com> | 2006-07-01 14:56:42 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-07-01 14:56:42 -0400 |
commit | 35912c799722f0c63b8c2c49c7650d4516a5fe8a (patch) | |
tree | c8f37a3c1ea5138d593be82634913f3fbedf46ec /arch/arm/plat-omap/dmtimer.c | |
parent | ff0daca525dde796382b9ccd563f169df2571211 (diff) |
[ARM] 3676/1: ARM: OMAP: Fix dmtimers and timer32k to compile on OMAP1
Patch from Tony Lindgren
Fixes compilation errors on OMAP1. Patch from Timo Teras.
Signed-off-by: Timo Teras <timo.teras@solidboot.com>
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-omap/dmtimer.c')
-rw-r--r-- | arch/arm/plat-omap/dmtimer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 804a53534370..50524436de63 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c | |||
@@ -260,7 +260,7 @@ __u32 omap_dm_timer_modify_idlect_mask(__u32 inputmask) | |||
260 | for (i = 0; i < dm_timer_count; i++) { | 260 | for (i = 0; i < dm_timer_count; i++) { |
261 | u32 l; | 261 | u32 l; |
262 | 262 | ||
263 | l = omap_dm_timer_read_reg(&dm_timers[n], OMAP_TIMER_CTRL_REG); | 263 | l = omap_dm_timer_read_reg(&dm_timers[i], OMAP_TIMER_CTRL_REG); |
264 | if (l & OMAP_TIMER_CTRL_ST) { | 264 | if (l & OMAP_TIMER_CTRL_ST) { |
265 | if (((omap_readl(MOD_CONF_CTRL_1) >> (i * 2)) & 0x03) == 0) | 265 | if (((omap_readl(MOD_CONF_CTRL_1) >> (i * 2)) & 0x03) == 0) |
266 | inputmask &= ~(1 << 1); | 266 | inputmask &= ~(1 << 1); |