diff options
Diffstat (limited to 'arch/mips/mips-boards')
-rw-r--r-- | arch/mips/mips-boards/atlas/atlas_setup.c | 5 | ||||
-rw-r--r-- | arch/mips/mips-boards/generic/time.c | 4 | ||||
-rw-r--r-- | arch/mips/mips-boards/malta/malta_setup.c | 4 | ||||
-rw-r--r-- | arch/mips/mips-boards/sead/sead_setup.c | 3 |
4 files changed, 2 insertions, 14 deletions
diff --git a/arch/mips/mips-boards/atlas/atlas_setup.c b/arch/mips/mips-boards/atlas/atlas_setup.c index c68358a476dd..86bfc0548164 100644 --- a/arch/mips/mips-boards/atlas/atlas_setup.c +++ b/arch/mips/mips-boards/atlas/atlas_setup.c | |||
@@ -35,8 +35,6 @@ | |||
35 | #include <asm/traps.h> | 35 | #include <asm/traps.h> |
36 | 36 | ||
37 | extern void mips_reboot_setup(void); | 37 | extern void mips_reboot_setup(void); |
38 | extern void mips_time_init(void); | ||
39 | extern unsigned long mips_rtc_get_time(void); | ||
40 | 38 | ||
41 | #ifdef CONFIG_KGDB | 39 | #ifdef CONFIG_KGDB |
42 | extern void kgdb_config(void); | 40 | extern void kgdb_config(void); |
@@ -63,9 +61,6 @@ void __init plat_mem_setup(void) | |||
63 | kgdb_config(); | 61 | kgdb_config(); |
64 | #endif | 62 | #endif |
65 | mips_reboot_setup(); | 63 | mips_reboot_setup(); |
66 | |||
67 | board_time_init = mips_time_init; | ||
68 | rtc_mips_get_time = mips_rtc_get_time; | ||
69 | } | 64 | } |
70 | 65 | ||
71 | static void __init serial_init(void) | 66 | static void __init serial_init(void) |
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c index d7bff9ca5356..075f9d46f40e 100644 --- a/arch/mips/mips-boards/generic/time.c +++ b/arch/mips/mips-boards/generic/time.c | |||
@@ -224,12 +224,12 @@ static unsigned int __init estimate_cpu_frequency(void) | |||
224 | return count; | 224 | return count; |
225 | } | 225 | } |
226 | 226 | ||
227 | unsigned long __init mips_rtc_get_time(void) | 227 | unsigned long read_persistent_clock(void) |
228 | { | 228 | { |
229 | return mc146818_get_cmos_time(); | 229 | return mc146818_get_cmos_time(); |
230 | } | 230 | } |
231 | 231 | ||
232 | void __init mips_time_init(void) | 232 | void __init plat_time_init(void) |
233 | { | 233 | { |
234 | unsigned int est_freq; | 234 | unsigned int est_freq; |
235 | 235 | ||
diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c index 8f1b78dfd89f..a5a5a43a1984 100644 --- a/arch/mips/mips-boards/malta/malta_setup.c +++ b/arch/mips/mips-boards/malta/malta_setup.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | extern void mips_reboot_setup(void); | 38 | extern void mips_reboot_setup(void); |
39 | extern void mips_time_init(void); | ||
40 | extern unsigned long mips_rtc_get_time(void); | 39 | extern unsigned long mips_rtc_get_time(void); |
41 | 40 | ||
42 | #ifdef CONFIG_KGDB | 41 | #ifdef CONFIG_KGDB |
@@ -185,7 +184,4 @@ void __init plat_mem_setup(void) | |||
185 | #endif | 184 | #endif |
186 | #endif | 185 | #endif |
187 | mips_reboot_setup(); | 186 | mips_reboot_setup(); |
188 | |||
189 | board_time_init = mips_time_init; | ||
190 | rtc_mips_get_time = mips_rtc_get_time; | ||
191 | } | 187 | } |
diff --git a/arch/mips/mips-boards/sead/sead_setup.c b/arch/mips/mips-boards/sead/sead_setup.c index 5f70eaf01fab..fad58972f3ac 100644 --- a/arch/mips/mips-boards/sead/sead_setup.c +++ b/arch/mips/mips-boards/sead/sead_setup.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <asm/time.h> | 35 | #include <asm/time.h> |
36 | 36 | ||
37 | extern void mips_reboot_setup(void); | 37 | extern void mips_reboot_setup(void); |
38 | extern void mips_time_init(void); | ||
39 | 38 | ||
40 | static void __init serial_init(void); | 39 | static void __init serial_init(void); |
41 | 40 | ||
@@ -52,8 +51,6 @@ void __init plat_mem_setup(void) | |||
52 | 51 | ||
53 | serial_init (); | 52 | serial_init (); |
54 | 53 | ||
55 | board_time_init = mips_time_init; | ||
56 | |||
57 | mips_reboot_setup(); | 54 | mips_reboot_setup(); |
58 | } | 55 | } |
59 | 56 | ||