diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-20 14:24:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-20 14:25:03 -0400 |
| commit | bfefb7a0c6e08736f2d5917c468467f134bf28bb (patch) | |
| tree | 7aa7084114dc083fe5b4d7b532901bdeb67188e7 /arch/arm/mach-omap1/time.c | |
| parent | 8d0cc631f6dd0a9283ceb7d61d8b85ecbcd355ea (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: Bring in changes that the next patch will depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-omap1/time.c')
| -rw-r--r-- | arch/arm/mach-omap1/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c index 4d56408d3cff..1be6a214d88d 100644 --- a/arch/arm/mach-omap1/time.c +++ b/arch/arm/mach-omap1/time.c | |||
| @@ -62,8 +62,8 @@ typedef struct { | |||
| 62 | u32 read_tim; /* READ_TIM, R */ | 62 | u32 read_tim; /* READ_TIM, R */ |
| 63 | } omap_mpu_timer_regs_t; | 63 | } omap_mpu_timer_regs_t; |
| 64 | 64 | ||
| 65 | #define omap_mpu_timer_base(n) \ | 65 | #define omap_mpu_timer_base(n) \ |
| 66 | ((volatile omap_mpu_timer_regs_t*)IO_ADDRESS(OMAP_MPU_TIMER_BASE + \ | 66 | ((volatile omap_mpu_timer_regs_t*)OMAP1_IO_ADDRESS(OMAP_MPU_TIMER_BASE + \ |
| 67 | (n)*OMAP_MPU_TIMER_OFFSET)) | 67 | (n)*OMAP_MPU_TIMER_OFFSET)) |
| 68 | 68 | ||
| 69 | static inline unsigned long omap_mpu_timer_read(int nr) | 69 | static inline unsigned long omap_mpu_timer_read(int nr) |