diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-28 08:03:23 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-28 08:03:34 +0100 |
| commit | 66eae035dc59755c51ad3b3c718a5ed7535322e3 (patch) | |
| tree | a30f914378e8c72c2885d2d53551d6e3fbf4bd6d /arch/arm/mach-at91/board-cpu9krea.c | |
| parent | Merge branch 'vt8500/wm8x50' into next/soc (diff) | |
| parent | Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into... (diff) | |
| download | linux-66eae035dc59755c51ad3b3c718a5ed7535322e3.tar.xz linux-66eae035dc59755c51ad3b3c718a5ed7535322e3.zip | |
Merge branch 'depends/cleanup' into next/soc
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-at91/board-cpu9krea.c')
| -rw-r--r-- | arch/arm/mach-at91/board-cpu9krea.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-cpu9krea.c b/arch/arm/mach-at91/board-cpu9krea.c index 847432441ecc..008527efdbcf 100644 --- a/arch/arm/mach-at91/board-cpu9krea.c +++ b/arch/arm/mach-at91/board-cpu9krea.c @@ -374,7 +374,7 @@ MACHINE_START(CPUAT9260, "Eukrea CPU9260") MACHINE_START(CPUAT9G20, "Eukrea CPU9G20") #endif /* Maintainer: Eric Benard - EUKREA Electromatique */ - .timer = &at91sam926x_timer, + .init_time = at91sam926x_pit_init, .map_io = at91_map_io, .handle_irq = at91_aic_handle_irq, .init_early = cpu9krea_init_early, |