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-s3c64xx/mach-smdk6410.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-s3c64xx/mach-smdk6410.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index 8bc8edd85e5a..08309155d087 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | 43 | ||
| 44 | #include <video/platform_lcd.h> | 44 | #include <video/platform_lcd.h> |
| 45 | 45 | ||
| 46 | #include <asm/hardware/vic.h> | ||
| 46 | #include <asm/mach/arch.h> | 47 | #include <asm/mach/arch.h> |
| 47 | #include <asm/mach/map.h> | 48 | #include <asm/mach/map.h> |
| 48 | #include <asm/mach/irq.h> | 49 | #include <asm/mach/irq.h> |
| @@ -700,6 +701,7 @@ MACHINE_START(SMDK6410, "SMDK6410") | |||
| 700 | .atag_offset = 0x100, | 701 | .atag_offset = 0x100, |
| 701 | 702 | ||
| 702 | .init_irq = s3c6410_init_irq, | 703 | .init_irq = s3c6410_init_irq, |
| 704 | .handle_irq = vic_handle_irq, | ||
| 703 | .map_io = smdk6410_map_io, | 705 | .map_io = smdk6410_map_io, |
| 704 | .init_machine = smdk6410_machine_init, | 706 | .init_machine = smdk6410_machine_init, |
| 705 | .timer = &s3c24xx_timer, | 707 | .timer = &s3c24xx_timer, |