git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'iop-raid6' into async-tx-next
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
time.c
diff --git
a/arch/arm/mach-imx/time.c
b/arch/arm/mach-imx/time.c
index
a11765f
..
5aef18b
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);
}
@@
-184,7
+184,7
@@
static int __init imx_clockevent_init(unsigned long rate)
clockevent_imx.min_delta_ns =
clockevent_delta2ns(0xf, &clockevent_imx);
clockevent_imx.min_delta_ns =
clockevent_delta2ns(0xf, &clockevent_imx);
- clockevent_imx.cpumask = cpumask_of
_cpu
(0);
+ clockevent_imx.cpumask = cpumask_of(0);
clockevents_register_device(&clockevent_imx);
clockevents_register_device(&clockevent_imx);