From d3660762465dc5bf07f168d2577c409faaf86f8d Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 15 Jul 2009 09:31:15 +0200 Subject: [PATCH] --- yaml --- r: 160880 b: refs/heads/master c: cf983c93aea2a6cd6de5b405b7506af7732f91d0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx3/clock-imx35.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 59b32c8d1373..879026f16bf6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 635baf6b40ebaef683abf87d677467cba71a0d50 +refs/heads/master: cf983c93aea2a6cd6de5b405b7506af7732f91d0 diff --git a/trunk/arch/arm/mach-mx3/clock-imx35.c b/trunk/arch/arm/mach-mx3/clock-imx35.c index 4cf1849f552e..1dbcdc07257e 100644 --- a/trunk/arch/arm/mach-mx3/clock-imx35.c +++ b/trunk/arch/arm/mach-mx3/clock-imx35.c @@ -456,7 +456,7 @@ int __init mx35_clocks_init() __raw_writel((3 << 26) | ll, CCM_BASE + CCM_CGR2); __raw_writel(0, CCM_BASE + CCM_CGR3); - mxc_timer_init(&ipg_clk, IO_ADDRESS(GPT1_BASE_ADDR), MXC_INT_GPT); + mxc_timer_init(&gpt_clk, IO_ADDRESS(GPT1_BASE_ADDR), MXC_INT_GPT); return 0; }