diff options
Diffstat (limited to 'arch/arm/mach-s5p64x0/mach-smdk6440.c')
-rw-r--r-- | arch/arm/mach-s5p64x0/mach-smdk6440.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c index e23723a5a214..73f71a698a34 100644 --- a/arch/arm/mach-s5p64x0/mach-smdk6440.c +++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c | |||
@@ -48,7 +48,7 @@ | |||
48 | #include <plat/pll.h> | 48 | #include <plat/pll.h> |
49 | #include <plat/adc.h> | 49 | #include <plat/adc.h> |
50 | #include <linux/platform_data/touchscreen-s3c2410.h> | 50 | #include <linux/platform_data/touchscreen-s3c2410.h> |
51 | #include <plat/s5p-time.h> | 51 | #include <plat/samsung-time.h> |
52 | #include <plat/backlight.h> | 52 | #include <plat/backlight.h> |
53 | #include <plat/fb.h> | 53 | #include <plat/fb.h> |
54 | #include <plat/sdhci.h> | 54 | #include <plat/sdhci.h> |
@@ -229,7 +229,7 @@ static void __init smdk6440_map_io(void) | |||
229 | s5p64x0_init_io(NULL, 0); | 229 | s5p64x0_init_io(NULL, 0); |
230 | s3c24xx_init_clocks(12000000); | 230 | s3c24xx_init_clocks(12000000); |
231 | s3c24xx_init_uarts(smdk6440_uartcfgs, ARRAY_SIZE(smdk6440_uartcfgs)); | 231 | s3c24xx_init_uarts(smdk6440_uartcfgs, ARRAY_SIZE(smdk6440_uartcfgs)); |
232 | s5p_set_timer_source(S5P_PWM3, S5P_PWM4); | 232 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); |
233 | } | 233 | } |
234 | 234 | ||
235 | static void s5p6440_set_lcd_interface(void) | 235 | static void s5p6440_set_lcd_interface(void) |
@@ -273,6 +273,6 @@ MACHINE_START(SMDK6440, "SMDK6440") | |||
273 | .init_irq = s5p6440_init_irq, | 273 | .init_irq = s5p6440_init_irq, |
274 | .map_io = smdk6440_map_io, | 274 | .map_io = smdk6440_map_io, |
275 | .init_machine = smdk6440_machine_init, | 275 | .init_machine = smdk6440_machine_init, |
276 | .init_time = s5p_timer_init, | 276 | .init_time = samsung_timer_init, |
277 | .restart = s5p64x0_restart, | 277 | .restart = s5p64x0_restart, |
278 | MACHINE_END | 278 | MACHINE_END |