aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-prima2
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-prima2')
-rw-r--r--arch/arm/mach-prima2/clock.c4
-rw-r--r--arch/arm/mach-prima2/prima2.c2
-rw-r--r--arch/arm/mach-prima2/timer.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-prima2/clock.c b/arch/arm/mach-prima2/clock.c
index 615a4e75ceab..aebad7e565cf 100644
--- a/arch/arm/mach-prima2/clock.c
+++ b/arch/arm/mach-prima2/clock.c
@@ -350,10 +350,10 @@ static struct clk_lookup onchip_clks[] = {
350 .clk = &clk_mem, 350 .clk = &clk_mem,
351 }, { 351 }, {
352 .dev_id = "sys", 352 .dev_id = "sys",
353 .clk = &clk_sys, 353 .clk = &clk_sys,
354 }, { 354 }, {
355 .dev_id = "io", 355 .dev_id = "io",
356 .clk = &clk_io, 356 .clk = &clk_io,
357 }, 357 },
358}; 358};
359 359
diff --git a/arch/arm/mach-prima2/prima2.c b/arch/arm/mach-prima2/prima2.c
index ee33c3d458f5..ef555c041962 100644
--- a/arch/arm/mach-prima2/prima2.c
+++ b/arch/arm/mach-prima2/prima2.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Defines machines for CSR SiRFprimaII 2 * Defines machines for CSR SiRFprimaII
3 * 3 *
4 * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. 4 * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
5 * 5 *
diff --git a/arch/arm/mach-prima2/timer.c b/arch/arm/mach-prima2/timer.c
index ed7ec48d11da..26ab6fee5619 100644
--- a/arch/arm/mach-prima2/timer.c
+++ b/arch/arm/mach-prima2/timer.c
@@ -133,14 +133,14 @@ static struct irqaction sirfsoc_timer_irq = {
133/* Overwrite weak default sched_clock with more precise one */ 133/* Overwrite weak default sched_clock with more precise one */
134unsigned long long notrace sched_clock(void) 134unsigned long long notrace sched_clock(void)
135{ 135{
136 static int is_mapped = 0; 136 static int is_mapped;
137 137
138 /* 138 /*
139 * sched_clock is called earlier than .init of sys_timer 139 * sched_clock is called earlier than .init of sys_timer
140 * if we map timer memory in .init of sys_timer, system 140 * if we map timer memory in .init of sys_timer, system
141 * will panic due to illegal memory access 141 * will panic due to illegal memory access
142 */ 142 */
143 if(!is_mapped) { 143 if (!is_mapped) {
144 sirfsoc_of_timer_map(); 144 sirfsoc_of_timer_map();
145 is_mapped = 1; 145 is_mapped = 1;
146 } 146 }