diff options
Diffstat (limited to 'arch/mips/lemote')
-rw-r--r-- | arch/mips/lemote/lm2e/prom.c | 6 | ||||
-rw-r--r-- | arch/mips/lemote/lm2e/setup.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/lemote/lm2e/prom.c b/arch/mips/lemote/lm2e/prom.c index 67312d7acf2a..4e3132e47bee 100644 --- a/arch/mips/lemote/lm2e/prom.c +++ b/arch/mips/lemote/lm2e/prom.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <asm/bootinfo.h> | 23 | #include <asm/bootinfo.h> |
24 | 24 | ||
25 | extern unsigned long bus_clock; | 25 | extern unsigned long bus_clock; |
26 | extern unsigned long cpu_clock; | 26 | extern unsigned long cpu_clock_freq; |
27 | extern unsigned int memsize, highmemsize; | 27 | extern unsigned int memsize, highmemsize; |
28 | extern int putDebugChar(unsigned char byte); | 28 | extern int putDebugChar(unsigned char byte); |
29 | 29 | ||
@@ -81,7 +81,7 @@ do { \ | |||
81 | l = (long)*env; | 81 | l = (long)*env; |
82 | while (l != 0) { | 82 | while (l != 0) { |
83 | parse_even_earlier(bus_clock, "busclock", l); | 83 | parse_even_earlier(bus_clock, "busclock", l); |
84 | parse_even_earlier(cpu_clock, "cpuclock", l); | 84 | parse_even_earlier(cpu_clock_freq, "cpuclock", l); |
85 | parse_even_earlier(memsize, "memsize", l); | 85 | parse_even_earlier(memsize, "memsize", l); |
86 | parse_even_earlier(highmemsize, "highmemsize", l); | 86 | parse_even_earlier(highmemsize, "highmemsize", l); |
87 | env++; | 87 | env++; |
@@ -91,7 +91,7 @@ do { \ | |||
91 | memsize = 256; | 91 | memsize = 256; |
92 | 92 | ||
93 | pr_info("busclock=%ld, cpuclock=%ld,memsize=%d,highmemsize=%d\n", | 93 | pr_info("busclock=%ld, cpuclock=%ld,memsize=%d,highmemsize=%d\n", |
94 | bus_clock, cpu_clock, memsize, highmemsize); | 94 | bus_clock, cpu_clock_freq, memsize, highmemsize); |
95 | } | 95 | } |
96 | 96 | ||
97 | void __init prom_free_prom_memory(void) | 97 | void __init prom_free_prom_memory(void) |
diff --git a/arch/mips/lemote/lm2e/setup.c b/arch/mips/lemote/lm2e/setup.c index 0e4d1fa572b5..dbb801678fd9 100644 --- a/arch/mips/lemote/lm2e/setup.c +++ b/arch/mips/lemote/lm2e/setup.c | |||
@@ -58,7 +58,7 @@ extern void mips_reboot_setup(void); | |||
58 | #define PTR_PAD(p) (p) | 58 | #define PTR_PAD(p) (p) |
59 | #endif | 59 | #endif |
60 | 60 | ||
61 | unsigned long cpu_clock; | 61 | unsigned long cpu_clock_freq; |
62 | unsigned long bus_clock; | 62 | unsigned long bus_clock; |
63 | unsigned int memsize; | 63 | unsigned int memsize; |
64 | unsigned int highmemsize = 0; | 64 | unsigned int highmemsize = 0; |
@@ -71,7 +71,7 @@ void __init plat_timer_setup(struct irqaction *irq) | |||
71 | static void __init loongson2e_time_init(void) | 71 | static void __init loongson2e_time_init(void) |
72 | { | 72 | { |
73 | /* setup mips r4k timer */ | 73 | /* setup mips r4k timer */ |
74 | mips_hpt_frequency = cpu_clock / 2; | 74 | mips_hpt_frequency = cpu_clock_freq / 2; |
75 | } | 75 | } |
76 | 76 | ||
77 | static unsigned long __init mips_rtc_get_time(void) | 77 | static unsigned long __init mips_rtc_get_time(void) |