diff options
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-crag6410.c')
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index d04b65448510..f1c848aa4a1e 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 | ||
@@ -50,7 +51,6 @@ | |||
50 | 51 | ||
51 | #include <mach/regs-gpio-memport.h> | 52 | #include <mach/regs-gpio-memport.h> |
52 | 53 | ||
53 | #include <plat/s3c6410.h> | ||
54 | #include <plat/regs-serial.h> | 54 | #include <plat/regs-serial.h> |
55 | #include <plat/regs-fb-v4.h> | 55 | #include <plat/regs-fb-v4.h> |
56 | #include <plat/fb.h> | 56 | #include <plat/fb.h> |
@@ -66,6 +66,8 @@ | |||
66 | #include <plat/iic.h> | 66 | #include <plat/iic.h> |
67 | #include <plat/pm.h> | 67 | #include <plat/pm.h> |
68 | 68 | ||
69 | #include "common.h" | ||
70 | |||
69 | /* serial port setup */ | 71 | /* serial port setup */ |
70 | 72 | ||
71 | #define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK) | 73 | #define UCON (S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK) |
@@ -711,7 +713,9 @@ MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410") | |||
711 | /* Maintainer: Mark Brown <broonie@opensource.wolfsonmicro.com> */ | 713 | /* Maintainer: Mark Brown <broonie@opensource.wolfsonmicro.com> */ |
712 | .atag_offset = 0x100, | 714 | .atag_offset = 0x100, |
713 | .init_irq = s3c6410_init_irq, | 715 | .init_irq = s3c6410_init_irq, |
716 | .handle_irq = vic_handle_irq, | ||
714 | .map_io = crag6410_map_io, | 717 | .map_io = crag6410_map_io, |
715 | .init_machine = crag6410_machine_init, | 718 | .init_machine = crag6410_machine_init, |
716 | .timer = &s3c24xx_timer, | 719 | .timer = &s3c24xx_timer, |
720 | .restart = s3c64xx_restart, | ||
717 | MACHINE_END | 721 | MACHINE_END |