diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 23:00:18 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 23:00:18 +0200 |
| commit | 31400bb56c0a6e55cd1e8f427f5ffcff2befcac4 (patch) | |
| tree | c3030b80f8cd32f715248fb7ae56a6837953737d /arch/arm/mach-shmobile/board-armadillo800eva.c | |
| parent | 6816bfa3e8ab18ef22c4b23921195db50d24befc (diff) | |
| parent | 86f887c105b909a2cea7b06f2136d66b3438b038 (diff) | |
| download | linux-31400bb56c0a6e55cd1e8f427f5ffcff2befcac4.tar.bz2 | |
Merge branch 'renesas-fixes' into renesas-soc
* renesas-fixes:
ARM: shmobile: r8a7779: Route all interrupts to ARM
ARM: shmobile: kzm9d: use late init machine hook
ARM: shmobile: kzm9g: use late init machine hook
ARM: mach-shmobile: armadillo800eva: Use late init machine hook
Diffstat (limited to 'arch/arm/mach-shmobile/board-armadillo800eva.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index 6e6839d0a2dc..d131e12c9ac8 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -780,6 +780,7 @@ DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva") .init_irq = r8a7740_init_irq, .handle_irq = shmobile_handle_irq_intc, .init_machine = eva_init, + .init_late = shmobile_init_late, .timer = &shmobile_timer, .dt_compat = eva_boards_compat_dt, MACHINE_END |