diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:24:33 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:24:33 +0000 |
| commit | 2e0e943436912ffe0848ece58167edfe754edb96 (patch) | |
| tree | b91919095c74742fa06e2105db6d859bee39b2b4 /arch/arm/mach-s5pv210/mach-smdkv210.c | |
| parent | a32737e1ca650504f172292dd344eb64c02311f3 (diff) | |
| parent | ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 (diff) | |
| download | talos-op-linux-2e0e943436912ffe0848ece58167edfe754edb96.tar.gz talos-op-linux-2e0e943436912ffe0848ece58167edfe754edb96.zip | |
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-s5pv210/mach-smdkv210.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkv210.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c index 8662ef6e5681..3ac9e57d9705 100644 --- a/arch/arm/mach-s5pv210/mach-smdkv210.c +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c @@ -20,6 +20,7 @@ #include <linux/delay.h> #include <linux/pwm_backlight.h> +#include <asm/hardware/vic.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/setup.h> @@ -316,6 +317,7 @@ MACHINE_START(SMDKV210, "SMDKV210") /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ .atag_offset = 0x100, .init_irq = s5pv210_init_irq, + .handle_irq = vic_handle_irq, .map_io = smdkv210_map_io, .init_machine = smdkv210_machine_init, .timer = &s5p_timer, |
