From c2183e59a57f1a4c8d3023c75ee2052464faabde Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Fri, 23 Apr 2010 06:49:43 +0200 Subject: [PATCH] --- yaml --- r: 198453 b: refs/heads/master c: d943f2c82144b0fb8aaebfbc6659c02cc3340527 h: refs/heads/master i: 198451: 5db6ceb860991ed5928065365c455b798a4c891b v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/time.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 784f1bd472af..266f0bd6cd1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e24798e637f5d5222f9fd767aefbea15de456e4a +refs/heads/master: d943f2c82144b0fb8aaebfbc6659c02cc3340527 diff --git a/trunk/arch/arm/plat-mxc/time.c b/trunk/arch/arm/plat-mxc/time.c index 714bdeffbe57..f9a1b059a76c 100644 --- a/trunk/arch/arm/plat-mxc/time.c +++ b/trunk/arch/arm/plat-mxc/time.c @@ -102,7 +102,7 @@ static void gpt_irq_acknowledge(void) __raw_writel(MX2_TSTAT_CAPT | MX2_TSTAT_COMP, timer_base + MX1_2_TSTAT); } else if (timer_is_v2()) - __raw_writel(MX3_TSTAT_OF1, timer_base + MX3_TSTAT); + __raw_writel(V2_TSTAT_OF1, timer_base + V2_TSTAT); } static cycle_t mx1_2_get_cycles(struct clocksource *cs)