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-crag6410.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-crag6410.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index d04b6544851..988ac2e48f0 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/mfd/wm831x/irq.h> | 37 | #include <linux/mfd/wm831x/irq.h> |
| 38 | #include <linux/mfd/wm831x/gpio.h> | 38 | #include <linux/mfd/wm831x/gpio.h> |
| 39 | 39 | ||
| 40 | #include <asm/hardware/vic.h> | ||
| 40 | #include <asm/mach/arch.h> | 41 | #include <asm/mach/arch.h> |
| 41 | #include <asm/mach-types.h> | 42 | #include <asm/mach-types.h> |
| 42 | 43 | ||
| @@ -711,6 +712,7 @@ MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410") | |||
| 711 | /* Maintainer: Mark Brown <broonie@opensource.wolfsonmicro.com> */ | 712 | /* Maintainer: Mark Brown <broonie@opensource.wolfsonmicro.com> */ |
| 712 | .atag_offset = 0x100, | 713 | .atag_offset = 0x100, |
| 713 | .init_irq = s3c6410_init_irq, | 714 | .init_irq = s3c6410_init_irq, |
| 715 | .handle_irq = vic_handle_irq, | ||
| 714 | .map_io = crag6410_map_io, | 716 | .map_io = crag6410_map_io, |
| 715 | .init_machine = crag6410_machine_init, | 717 | .init_machine = crag6410_machine_init, |
| 716 | .timer = &s3c24xx_timer, | 718 | .timer = &s3c24xx_timer, |