diff options
Diffstat (limited to 'arch/arm/mach-s5p64x0/mach-smdk6450.c')
-rw-r--r-- | arch/arm/mach-s5p64x0/mach-smdk6450.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c index ca10963a959e..18303e12019f 100644 --- a/arch/arm/mach-s5p64x0/mach-smdk6450.c +++ b/arch/arm/mach-s5p64x0/mach-smdk6450.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> |
@@ -248,7 +248,7 @@ static void __init smdk6450_map_io(void) | |||
248 | s5p64x0_init_io(NULL, 0); | 248 | s5p64x0_init_io(NULL, 0); |
249 | s3c24xx_init_clocks(19200000); | 249 | s3c24xx_init_clocks(19200000); |
250 | s3c24xx_init_uarts(smdk6450_uartcfgs, ARRAY_SIZE(smdk6450_uartcfgs)); | 250 | s3c24xx_init_uarts(smdk6450_uartcfgs, ARRAY_SIZE(smdk6450_uartcfgs)); |
251 | s5p_set_timer_source(S5P_PWM3, S5P_PWM4); | 251 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); |
252 | } | 252 | } |
253 | 253 | ||
254 | static void s5p6450_set_lcd_interface(void) | 254 | static void s5p6450_set_lcd_interface(void) |
@@ -292,6 +292,6 @@ MACHINE_START(SMDK6450, "SMDK6450") | |||
292 | .init_irq = s5p6450_init_irq, | 292 | .init_irq = s5p6450_init_irq, |
293 | .map_io = smdk6450_map_io, | 293 | .map_io = smdk6450_map_io, |
294 | .init_machine = smdk6450_machine_init, | 294 | .init_machine = smdk6450_machine_init, |
295 | .init_time = s5p_timer_init, | 295 | .init_time = samsung_timer_init, |
296 | .restart = s5p64x0_restart, | 296 | .restart = s5p64x0_restart, |
297 | MACHINE_END | 297 | MACHINE_END |