diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-11 21:21:44 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-11 21:21:44 +0400 |
| commit | 5f48a29f1721736930b7817b430039c1d348dd05 (patch) | |
| tree | 69c47c1105d275810123785a947227b9aa8028d6 /arch/arm/mach-nomadik/board-nhk8815.c | |
| parent | 3ad06d1a7dfd99a2e8f3a41e0fa5118551186d3c (diff) | |
| parent | f8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff) | |
| download | linux-5f48a29f1721736930b7817b430039c1d348dd05.tar.xz | |
Merge branch 'depends/cleanup' into next/virt
Diffstat (limited to 'arch/arm/mach-nomadik/board-nhk8815.c')
| -rw-r--r-- | arch/arm/mach-nomadik/board-nhk8815.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index 5748df0d725a..aaed48d94374 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c @@ -266,10 +266,6 @@ static void __init nomadik_timer_init(void) nmdk_timer_init(io_p2v(NOMADIK_MTU0_BASE), IRQ_MTU0); } -static struct sys_timer nomadik_timer = { - .init = nomadik_timer_init, -}; - static struct i2c_board_info __initdata nhk8815_i2c0_devices[] = { { I2C_BOARD_INFO("stw4811", 0x2d), @@ -351,7 +347,7 @@ MACHINE_START(NOMADIK, "NHK8815") .atag_offset = 0x100, .map_io = cpu8815_map_io, .init_irq = cpu8815_init_irq, - .timer = &nomadik_timer, + .init_time = nomadik_timer_init, .init_machine = nhk8815_platform_init, .restart = cpu8815_restart, MACHINE_END |