]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
arm/plat-mxc: Fix forgotten renaming in timer.c
authorWolfram Sang <w.sang@pengutronix.de>
Fri, 23 Apr 2010 04:49:43 +0000 (06:49 +0200)
committerSascha Hauer <s.hauer@pengutronix.de>
Fri, 23 Apr 2010 07:22:30 +0000 (09:22 +0200)
Commit "mxc: Change gpt timer code to be more generic by using V2
instead of MX3" forgot to replace one occurence causing a build
failure.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Amit Kucheria <amit.kucheria@canonical.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
arch/arm/plat-mxc/time.c

index 714bdeffbe57e641c89306df87b010c57956f1b2..f9a1b059a76cde1926f50758200c046f27685e7d 100644 (file)
@@ -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)