diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 18:54:15 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 18:54:15 +0100 |
| commit | 7266d48fca8ee2a15d15222c41f887e10db54c5a (patch) | |
| tree | 775404bcbf8ce146ccaba905e841a3621ae7ce80 /arch/arm/mach-imx/mach-mx31lilly.c | |
| parent | 168268a225d24da3768a88c1029fb3014b0837ca (diff) | |
| parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea (diff) | |
Merge branch 'timer/cleanup' into late/mvebu2
Basing the mvebu patches on top of the timer cleanup
avoids some nasty merges.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31lilly.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31lilly.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/mach-mx31lilly.c b/arch/arm/mach-imx/mach-mx31lilly.c index 08b9965c8b3..832b1e2f964 100644 --- a/arch/arm/mach-imx/mach-mx31lilly.c +++ b/arch/arm/mach-imx/mach-mx31lilly.c @@ -303,17 +303,13 @@ static void __init mx31lilly_timer_init(void) mx31_clocks_init(26000000); } -static struct sys_timer mx31lilly_timer = { - .init = mx31lilly_timer_init, -}; - MACHINE_START(LILLY1131, "INCO startec LILLY-1131") .atag_offset = 0x100, .map_io = mx31_map_io, .init_early = imx31_init_early, .init_irq = mx31_init_irq, .handle_irq = imx31_handle_irq, - .timer = &mx31lilly_timer, + .init_time = mx31lilly_timer_init, .init_machine = mx31lilly_board_init, .restart = mxc_restart, MACHINE_END |