diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-16 00:18:53 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-16 00:18:53 -0500 |
| commit | b46ad442a998beb8453fd6b9c5a67cd8a1cd1889 (patch) | |
| tree | a5da6ea4aa5c6575fbeaddd3e24fbf9d20087019 /arch/arm/mach-s3c64xx/mach-smdk6400.c | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
| parent | a890b6760d975cdbdfcdf5753dab4c91059af9b1 (diff) | |
Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/board
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-smdk6400.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6400.c b/arch/arm/mach-s3c64xx/mach-smdk6400.c index 73450c2b530a..be28a59e3f57 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6400.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6400.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
| 24 | 24 | ||
| 25 | #include <asm/hardware/vic.h> | ||
| 25 | #include <asm/mach/arch.h> | 26 | #include <asm/mach/arch.h> |
| 26 | #include <asm/mach/map.h> | 27 | #include <asm/mach/map.h> |
| 27 | #include <asm/mach/irq.h> | 28 | #include <asm/mach/irq.h> |
| @@ -88,6 +89,7 @@ MACHINE_START(SMDK6400, "SMDK6400") | |||
| 88 | .atag_offset = 0x100, | 89 | .atag_offset = 0x100, |
| 89 | 90 | ||
| 90 | .init_irq = s3c6400_init_irq, | 91 | .init_irq = s3c6400_init_irq, |
| 92 | .handle_irq = vic_handle_irq, | ||
| 91 | .map_io = smdk6400_map_io, | 93 | .map_io = smdk6400_map_io, |
| 92 | .init_machine = smdk6400_machine_init, | 94 | .init_machine = smdk6400_machine_init, |
| 93 | .timer = &s3c24xx_timer, | 95 | .timer = &s3c24xx_timer, |