* [PATCH] arm/plat-mxc: Fix forgotten renaming in timer.c
@ 2010-04-23 4:49 Wolfram Sang
2010-04-23 6:17 ` Amit Kucheria
0 siblings, 1 reply; 2+ messages in thread
From: Wolfram Sang @ 2010-04-23 4:49 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
arch/arm/plat-mxc/time.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/plat-mxc/time.c b/arch/arm/plat-mxc/time.c
index 714bdef..f9a1b05 100644
--- a/arch/arm/plat-mxc/time.c
+++ b/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)
--
1.7.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] arm/plat-mxc: Fix forgotten renaming in timer.c
2010-04-23 4:49 [PATCH] arm/plat-mxc: Fix forgotten renaming in timer.c Wolfram Sang
@ 2010-04-23 6:17 ` Amit Kucheria
0 siblings, 0 replies; 2+ messages in thread
From: Amit Kucheria @ 2010-04-23 6:17 UTC (permalink / raw)
To: linux-arm-kernel
On 10 Apr 23, Wolfram Sang wrote:
> 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>
Oops-Acked-by: Amit Kucheria <amit.kucheria@canonical.com>
Thanks for the catch. :)
> ---
> arch/arm/plat-mxc/time.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/plat-mxc/time.c b/arch/arm/plat-mxc/time.c
> index 714bdef..f9a1b05 100644
> --- a/arch/arm/plat-mxc/time.c
> +++ b/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)
> --
> 1.7.0
>
--
----------------------------------------------------------------------
Amit Kucheria, Kernel Engineer || amit.kucheria at canonical.com
----------------------------------------------------------------------
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-23 6:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-23 4:49 [PATCH] arm/plat-mxc: Fix forgotten renaming in timer.c Wolfram Sang
2010-04-23 6:17 ` Amit Kucheria
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).