git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-imx
/
time.c
diff --git
a/arch/arm/mach-imx/time.c
b/arch/arm/mach-imx/time.c
index aff0ebcfa847a5422051c866e4e48f34109b7f76..5aef18b599e551fd8dea1ec8098e09111519ba85 100644
(file)
--- 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)
IMX_TCTL(TIMER_BASE) = TCTL_FRR | TCTL_CLK_PCLK1 | TCTL_TEN;
}
IMX_TCTL(TIMER_BASE) = TCTL_FRR | TCTL_CLK_PCLK1 | TCTL_TEN;
}
-cycle_t imx_get_cycles(
void
)
+cycle_t imx_get_cycles(
struct clocksource *cs
)
{
return IMX_TCN(TIMER_BASE);
}
{
return IMX_TCN(TIMER_BASE);
}