diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
| commit | 2e0e943436912ffe0848ece58167edfe754edb96 (patch) | |
| tree | b91919095c74742fa06e2105db6d859bee39b2b4 /arch/arm/mach-ep93xx/adssphere.c | |
| parent | a32737e1ca650504f172292dd344eb64c02311f3 (diff) | |
| parent | ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'arch/arm/mach-ep93xx/adssphere.c')
| -rw-r--r-- | arch/arm/mach-ep93xx/adssphere.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c index 0713448206a..d9b0ea2ba4d 100644 --- a/arch/arm/mach-ep93xx/adssphere.c +++ b/arch/arm/mach-ep93xx/adssphere.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | #include <mach/hardware.h> | 17 | #include <mach/hardware.h> |
| 18 | 18 | ||
| 19 | #include <asm/hardware/vic.h> | ||
| 19 | #include <asm/mach-types.h> | 20 | #include <asm/mach-types.h> |
| 20 | #include <asm/mach/arch.h> | 21 | #include <asm/mach/arch.h> |
| 21 | 22 | ||
| @@ -36,6 +37,7 @@ MACHINE_START(ADSSPHERE, "ADS Sphere board") | |||
| 36 | .atag_offset = 0x100, | 37 | .atag_offset = 0x100, |
| 37 | .map_io = ep93xx_map_io, | 38 | .map_io = ep93xx_map_io, |
| 38 | .init_irq = ep93xx_init_irq, | 39 | .init_irq = ep93xx_init_irq, |
| 40 | .handle_irq = vic_handle_irq, | ||
| 39 | .timer = &ep93xx_timer, | 41 | .timer = &ep93xx_timer, |
| 40 | .init_machine = adssphere_init_machine, | 42 | .init_machine = adssphere_init_machine, |
| 41 | MACHINE_END | 43 | MACHINE_END |