Commit 67553751 authored by Russell King's avatar Russell King

[ARM] Fix IMX build error post sys_timer merge.

parent 6a8a8108
...@@ -28,8 +28,7 @@ ...@@ -28,8 +28,7 @@
* Returns number of us since last clock interrupt. Note that interrupts * Returns number of us since last clock interrupt. Note that interrupts
* will have been disabled by do_gettimeoffset() * will have been disabled by do_gettimeoffset()
*/ */
static unsigned long static unsigned long imx_gettimeoffset(void)
imx_gettimeoffset(void)
{ {
unsigned long ticks; unsigned long ticks;
...@@ -80,8 +79,7 @@ static struct irqaction imx_timer_irq = { ...@@ -80,8 +79,7 @@ static struct irqaction imx_timer_irq = {
/* /*
* Set up timer interrupt, and return the current time in seconds. * Set up timer interrupt, and return the current time in seconds.
*/ */
static void __init static void __init imx_timer_init(void)
imx_timer_init(void)
{ {
/* /*
* Initialise to a known state (all timers off, and timing reset) * Initialise to a known state (all timers off, and timing reset)
...@@ -97,7 +95,7 @@ imx_timer_init(void) ...@@ -97,7 +95,7 @@ imx_timer_init(void)
setup_irq(TIM1_INT, &imx_timer_irq); setup_irq(TIM1_INT, &imx_timer_irq);
} }
struct imx_timer = { struct sys_timer imx_timer = {
.init = imx_timer_init, .init = imx_timer_init,
.offset = imx_gettimeoffset, .offset = imx_gettimeoffset,
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment