diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-03 02:26:33 -0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-03 02:26:33 -0400 |
| commit | c50e86ce7c2961a41f2f7aa6e4fd6c99229ba205 (patch) | |
| tree | 4ea36009719bd8fc523239fe1bdccb90f0dce3ae /arch/arm/mach-at91/board-1arm.c | |
| parent | 14d33d384693eb6083396199de516fdef320f7af (diff) | |
| parent | 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d (diff) | |
Merge tag 'v3.6-rc4'
Merge 3.6-rc4 to get latest OMAP and device tree fixes.
Diffstat (limited to 'arch/arm/mach-at91/board-1arm.c')
| -rw-r--r-- | arch/arm/mach-at91/board-1arm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/board-1arm.c b/arch/arm/mach-at91/board-1arm.c index 271f994314a4..22d8856094f1 100644 --- a/arch/arm/mach-at91/board-1arm.c +++ b/arch/arm/mach-at91/board-1arm.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | #include <mach/board.h> | 37 | #include <mach/board.h> |
| 38 | #include <mach/cpu.h> | 38 | #include <mach/cpu.h> |
| 39 | #include <mach/at91_aic.h> | ||
| 39 | 40 | ||
| 40 | #include "generic.h" | 41 | #include "generic.h" |
| 41 | 42 | ||
| @@ -91,6 +92,7 @@ MACHINE_START(ONEARM, "Ajeco 1ARM single board computer") | |||
| 91 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 92 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
| 92 | .timer = &at91rm9200_timer, | 93 | .timer = &at91rm9200_timer, |
| 93 | .map_io = at91_map_io, | 94 | .map_io = at91_map_io, |
| 95 | .handle_irq = at91_aic_handle_irq, | ||
| 94 | .init_early = onearm_init_early, | 96 | .init_early = onearm_init_early, |
| 95 | .init_irq = at91_init_irq_default, | 97 | .init_irq = at91_init_irq_default, |
| 96 | .init_machine = onearm_board_init, | 98 | .init_machine = onearm_board_init, |