diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-11 18:21:44 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-11 18:21:44 +0100 |
| commit | 5f48a29f1721736930b7817b430039c1d348dd05 (patch) | |
| tree | 69c47c1105d275810123785a947227b9aa8028d6 /arch/arm/mach-gemini/board-nas4220b.c | |
| parent | Merge branch 'depends/rmk-psci' into next/virt (diff) | |
| parent | Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into... (diff) | |
| download | linux-5f48a29f1721736930b7817b430039c1d348dd05.tar.xz linux-5f48a29f1721736930b7817b430039c1d348dd05.zip | |
Merge branch 'depends/cleanup' into next/virt
Diffstat (limited to 'arch/arm/mach-gemini/board-nas4220b.c')
| -rw-r--r-- | arch/arm/mach-gemini/board-nas4220b.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-gemini/board-nas4220b.c b/arch/arm/mach-gemini/board-nas4220b.c index 5927d3c253aa..08bd650c42f3 100644 --- a/arch/arm/mach-gemini/board-nas4220b.c +++ b/arch/arm/mach-gemini/board-nas4220b.c @@ -31,10 +31,6 @@ #include "common.h" -static struct sys_timer ib4220b_timer = { - .init = gemini_timer_init, -}; - static struct gpio_led ib4220b_leds[] = { { .name = "nas4220b:orange:hdd", @@ -105,6 +101,6 @@ MACHINE_START(NAS4220B, "Raidsonic NAS IB-4220-B") .atag_offset = 0x100, .map_io = gemini_map_io, .init_irq = gemini_init_irq, - .timer = &ib4220b_timer, + .init_time = gemini_timer_init, .init_machine = ib4220b_init, MACHINE_END |