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-smartq7.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-smartq7.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-smartq7.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smartq7.c b/arch/arm/mach-s3c64xx/mach-smartq7.c index f112547ce80a..a58d1ba5cba2 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq7.c +++ b/arch/arm/mach-s3c64xx/mach-smartq7.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/leds.h> | 17 | #include <linux/leds.h> |
| 18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
| 19 | 19 | ||
| 20 | #include <asm/hardware/vic.h> | ||
| 20 | #include <asm/mach-types.h> | 21 | #include <asm/mach-types.h> |
| 21 | #include <asm/mach/arch.h> | 22 | #include <asm/mach/arch.h> |
| 22 | 23 | ||
| @@ -164,6 +165,7 @@ MACHINE_START(SMARTQ7, "SmartQ 7") | |||
| 164 | /* Maintainer: Maurus Cuelenaere <mcuelenaere AT gmail DOT com> */ | 165 | /* Maintainer: Maurus Cuelenaere <mcuelenaere AT gmail DOT com> */ |
| 165 | .atag_offset = 0x100, | 166 | .atag_offset = 0x100, |
| 166 | .init_irq = s3c6410_init_irq, | 167 | .init_irq = s3c6410_init_irq, |
| 168 | .handle_irq = vic_handle_irq, | ||
| 167 | .map_io = smartq_map_io, | 169 | .map_io = smartq_map_io, |
| 168 | .init_machine = smartq7_machine_init, | 170 | .init_machine = smartq7_machine_init, |
| 169 | .timer = &s3c24xx_timer, | 171 | .timer = &s3c24xx_timer, |