summaryrefslogtreecommitdiff
path: root/arch/arm/mach-exynos/mach-smdk4x12.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-17 02:50:01 +0400
committerOlof Johansson <olof@lixom.net>2011-12-17 02:50:01 +0400
commitb94ee062b5b41c7fc0e44309e8546d4694e75007 (patch)
tree2ba08003be8d25a573c17a00a627b424de4bb2e4 /arch/arm/mach-exynos/mach-smdk4x12.c
parentdc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff)
parent3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d (diff)
downloadlinux-b94ee062b5b41c7fc0e44309e8546d4694e75007.tar.xz
Merge branch 'depends/rmk/devel-stable' into next/boards
Diffstat (limited to 'arch/arm/mach-exynos/mach-smdk4x12.c')
-rw-r--r--arch/arm/mach-exynos/mach-smdk4x12.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/mach-smdk4x12.c b/arch/arm/mach-exynos/mach-smdk4x12.c
index fcf2e0e23d53..722d82d7f217 100644
--- a/arch/arm/mach-exynos/mach-smdk4x12.c
+++ b/arch/arm/mach-exynos/mach-smdk4x12.c
@@ -21,6 +21,7 @@
#include <linux/serial_core.h>
#include <asm/mach/arch.h>
+#include <asm/hardware/gic.h>
#include <asm/mach-types.h>
#include <plat/backlight.h>
@@ -287,6 +288,7 @@ MACHINE_START(SMDK4212, "SMDK4212")
.atag_offset = 0x100,
.init_irq = exynos4_init_irq,
.map_io = smdk4x12_map_io,
+ .handle_irq = gic_handle_irq,
.init_machine = smdk4x12_machine_init,
.timer = &exynos4_timer,
MACHINE_END
@@ -297,6 +299,7 @@ MACHINE_START(SMDK4412, "SMDK4412")
.atag_offset = 0x100,
.init_irq = exynos4_init_irq,
.map_io = smdk4x12_map_io,
+ .handle_irq = gic_handle_irq,
.init_machine = smdk4x12_machine_init,
.timer = &exynos4_timer,
MACHINE_END