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-exynos/mach-universal_c210.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-exynos/mach-universal_c210.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-universal_c210.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c index a2a177ff4b4..cfc7d5076f5 100644 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/i2c/atmel_mxt_ts.h> | 24 | #include <linux/i2c/atmel_mxt_ts.h> |
| 25 | 25 | ||
| 26 | #include <asm/mach/arch.h> | 26 | #include <asm/mach/arch.h> |
| 27 | #include <asm/hardware/gic.h> | ||
| 27 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
| 28 | 29 | ||
| 29 | #include <plat/regs-serial.h> | 30 | #include <plat/regs-serial.h> |
| @@ -1058,6 +1059,7 @@ MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210") | |||
| 1058 | .atag_offset = 0x100, | 1059 | .atag_offset = 0x100, |
| 1059 | .init_irq = exynos4_init_irq, | 1060 | .init_irq = exynos4_init_irq, |
| 1060 | .map_io = universal_map_io, | 1061 | .map_io = universal_map_io, |
| 1062 | .handle_irq = gic_handle_irq, | ||
| 1061 | .init_machine = universal_machine_init, | 1063 | .init_machine = universal_machine_init, |
| 1062 | .timer = &exynos4_timer, | 1064 | .timer = &exynos4_timer, |
| 1063 | .reserve = &universal_reserve, | 1065 | .reserve = &universal_reserve, |