diff options
author | Romain Naour <romain.naour@openwide.fr> | 2013-01-09 21:47:03 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-03-05 06:15:55 -0500 |
commit | c1fcd403ced3ad0d63418cc1120e1562283b16ce (patch) | |
tree | 18c8e636319516ee51c29c580293c849eaea13a2 /arch/arm/mach-s5pv210/mach-smdkc110.c | |
parent | 7488335dcf382574c47fb27fcbad3f04a9841db6 (diff) |
ARM: SAMSUNG: Rename s5p-time to samsung-time
Signed-off-by: Naour Romain <romain.naour@openwide.fr>
Reviewed-by: Tomasz Figa <tomasz.figa@gmail.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-smdkc110.c')
-rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkc110.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c index 28bd0248a3e2..7c0ed07a78a3 100644 --- a/arch/arm/mach-s5pv210/mach-smdkc110.c +++ b/arch/arm/mach-s5pv210/mach-smdkc110.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <linux/platform_data/ata-samsung_cf.h> | 29 | #include <linux/platform_data/ata-samsung_cf.h> |
30 | #include <linux/platform_data/i2c-s3c2410.h> | 30 | #include <linux/platform_data/i2c-s3c2410.h> |
31 | #include <plat/pm.h> | 31 | #include <plat/pm.h> |
32 | #include <plat/s5p-time.h> | 32 | #include <plat/samsung-time.h> |
33 | #include <plat/mfc.h> | 33 | #include <plat/mfc.h> |
34 | 34 | ||
35 | #include "common.h" | 35 | #include "common.h" |
@@ -120,7 +120,7 @@ static void __init smdkc110_map_io(void) | |||
120 | s5pv210_init_io(NULL, 0); | 120 | s5pv210_init_io(NULL, 0); |
121 | s3c24xx_init_clocks(24000000); | 121 | s3c24xx_init_clocks(24000000); |
122 | s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs)); | 122 | s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs)); |
123 | s5p_set_timer_source(S5P_PWM3, S5P_PWM4); | 123 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); |
124 | } | 124 | } |
125 | 125 | ||
126 | static void __init smdkc110_reserve(void) | 126 | static void __init smdkc110_reserve(void) |
@@ -153,7 +153,7 @@ MACHINE_START(SMDKC110, "SMDKC110") | |||
153 | .init_irq = s5pv210_init_irq, | 153 | .init_irq = s5pv210_init_irq, |
154 | .map_io = smdkc110_map_io, | 154 | .map_io = smdkc110_map_io, |
155 | .init_machine = smdkc110_machine_init, | 155 | .init_machine = smdkc110_machine_init, |
156 | .init_time = s5p_timer_init, | 156 | .init_time = samsung_timer_init, |
157 | .restart = s5pv210_restart, | 157 | .restart = s5pv210_restart, |
158 | .reserve = &smdkc110_reserve, | 158 | .reserve = &smdkc110_reserve, |
159 | MACHINE_END | 159 | MACHINE_END |