diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-19 22:38:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-19 22:38:59 -0400 |
| commit | 14d4962dc863ab42e898d66d4837aa6c3afedc3b (patch) | |
| tree | 780cb53645b781dfd33b6d0ad21e0596f2ad1a1a /arch/arm/mach-vexpress/v2m.c | |
| parent | 9717967c4b704ce344c954afb5bb160aa9c01c34 (diff) | |
| parent | 2b666ca4a68cbc22483b0f2e1ba3c0e59b01ae9e (diff) | |
Merge branch 'linus' into irq/core
Merge reason: update to almost-final-.36
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-vexpress/v2m.c')
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 817f0ad38a0b..7eaa232180a5 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c | |||
| @@ -48,7 +48,7 @@ void __init v2m_map_io(struct map_desc *tile, size_t num) | |||
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | 50 | ||
| 51 | static void v2m_timer_init(void) | 51 | static void __init v2m_timer_init(void) |
| 52 | { | 52 | { |
| 53 | writel(0, MMIO_P2V(V2M_TIMER0) + TIMER_CTRL); | 53 | writel(0, MMIO_P2V(V2M_TIMER0) + TIMER_CTRL); |
| 54 | writel(0, MMIO_P2V(V2M_TIMER1) + TIMER_CTRL); | 54 | writel(0, MMIO_P2V(V2M_TIMER1) + TIMER_CTRL); |