diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-04-30 11:36:52 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-04-30 11:36:52 -0400 |
| commit | 912bc6ae3de99c7bada4577d4341ace4ee59b5be (patch) | |
| tree | 28fd1a4bb9e4b05aa833285b46df169f12c0e24d /arch/arm/mach-imx/time.c | |
| parent | d37dc42ab6f040b8f0f2962ab219c5b2accf748d (diff) | |
| parent | 091438dd5668396328a3419abcbc6591159eb8d1 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-imx/time.c')
| -rw-r--r-- | arch/arm/mach-imx/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index aff0ebcfa847..5aef18b599e5 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c | |||
| @@ -73,7 +73,7 @@ static void __init imx_timer_hardware_init(void) | |||
| 73 | IMX_TCTL(TIMER_BASE) = TCTL_FRR | TCTL_CLK_PCLK1 | TCTL_TEN; | 73 | IMX_TCTL(TIMER_BASE) = TCTL_FRR | TCTL_CLK_PCLK1 | TCTL_TEN; |
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | cycle_t imx_get_cycles(void) | 76 | cycle_t imx_get_cycles(struct clocksource *cs) |
| 77 | { | 77 | { |
| 78 | return IMX_TCN(TIMER_BASE); | 78 | return IMX_TCN(TIMER_BASE); |
| 79 | } | 79 | } |