diff options
| author |   Simon Horman <horms+renesas@verge.net.au> | 2013-08-06 18:06:53 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-08-06 18:06:53 +0900 |
| commit | 4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793 (patch) | |
| tree | 3932656b422e63e3d3fc4629a57a1a8b7f03ef42 /arch/arm/mach-shmobile/board-armadillo800eva.c | |
| parent | ARM: shmobile: r8a7779: Remove '0x's from R8A7779 DTS file (diff) | |
| parent | ARM: shmobile: r8a7740: Add TPU node to the device tree (diff) | |
| download | linux-dev-4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793.tar.xz linux-dev-4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793.zip | |
Merge branch 'dt2' into cleanup3-base
Conflicts:
arch/arm/mach-shmobile/Makefile.boot
Diffstat (limited to 'arch/arm/mach-shmobile/board-armadillo800eva.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index f62719dc3bd6..bdcc8a055ad4 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -1315,7 +1315,7 @@ static const char *eva_boards_compat_dt[] __initdata = { DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva") .map_io = r8a7740_map_io, .init_early = eva_add_early_devices, - .init_irq = r8a7740_init_irq, + .init_irq = r8a7740_init_irq_of, .init_machine = eva_init, .init_late = shmobile_init_late, .init_time = eva_earlytimer_init, |