diff options
Diffstat (limited to 'arch/m68k/platform/coldfire')
-rw-r--r-- | arch/m68k/platform/coldfire/cache.c | 2 | ||||
-rw-r--r-- | arch/m68k/platform/coldfire/entry.S | 2 | ||||
-rw-r--r-- | arch/m68k/platform/coldfire/head.S | 2 | ||||
-rw-r--r-- | arch/m68k/platform/coldfire/intc.c | 2 | ||||
-rw-r--r-- | arch/m68k/platform/coldfire/sltimers.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/m68k/platform/coldfire/cache.c b/arch/m68k/platform/coldfire/cache.c index 235d3c4f4f0f..71beeaf0c5c4 100644 --- a/arch/m68k/platform/coldfire/cache.c +++ b/arch/m68k/platform/coldfire/cache.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /***************************************************************************/ | 1 | /***************************************************************************/ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * cache.c -- general ColdFire Cache maintainence code | 4 | * cache.c -- general ColdFire Cache maintenance code |
5 | * | 5 | * |
6 | * Copyright (C) 2010, Greg Ungerer (gerg@snapgear.com) | 6 | * Copyright (C) 2010, Greg Ungerer (gerg@snapgear.com) |
7 | */ | 7 | */ |
diff --git a/arch/m68k/platform/coldfire/entry.S b/arch/m68k/platform/coldfire/entry.S index 5837cf080b6d..eab63f09965b 100644 --- a/arch/m68k/platform/coldfire/entry.S +++ b/arch/m68k/platform/coldfire/entry.S | |||
@@ -163,7 +163,7 @@ Lsignal_return: | |||
163 | 163 | ||
164 | /* | 164 | /* |
165 | * This is the generic interrupt handler (for all hardware interrupt | 165 | * This is the generic interrupt handler (for all hardware interrupt |
166 | * sources). Calls upto high level code to do all the work. | 166 | * sources). Calls up to high level code to do all the work. |
167 | */ | 167 | */ |
168 | ENTRY(inthandler) | 168 | ENTRY(inthandler) |
169 | SAVE_ALL | 169 | SAVE_ALL |
diff --git a/arch/m68k/platform/coldfire/head.S b/arch/m68k/platform/coldfire/head.S index 129bff4956b5..6ae91a499184 100644 --- a/arch/m68k/platform/coldfire/head.S +++ b/arch/m68k/platform/coldfire/head.S | |||
@@ -20,7 +20,7 @@ | |||
20 | 20 | ||
21 | /* | 21 | /* |
22 | * If we don't have a fixed memory size, then lets build in code | 22 | * If we don't have a fixed memory size, then lets build in code |
23 | * to auto detect the DRAM size. Obviously this is the prefered | 23 | * to auto detect the DRAM size. Obviously this is the preferred |
24 | * method, and should work for most boards. It won't work for those | 24 | * method, and should work for most boards. It won't work for those |
25 | * that do not have their RAM starting at address 0, and it only | 25 | * that do not have their RAM starting at address 0, and it only |
26 | * works on SDRAM (not boards fitted with SRAM). | 26 | * works on SDRAM (not boards fitted with SRAM). |
diff --git a/arch/m68k/platform/coldfire/intc.c b/arch/m68k/platform/coldfire/intc.c index c28a6ed6cb23..0bbb414856eb 100644 --- a/arch/m68k/platform/coldfire/intc.c +++ b/arch/m68k/platform/coldfire/intc.c | |||
@@ -37,7 +37,7 @@ unsigned char mcf_irq2imr[NR_IRQS]; | |||
37 | /* | 37 | /* |
38 | * In the early version 2 core ColdFire parts the IMR register was 16 bits | 38 | * In the early version 2 core ColdFire parts the IMR register was 16 bits |
39 | * in size. Version 3 (and later version 2) core parts have a 32 bit | 39 | * in size. Version 3 (and later version 2) core parts have a 32 bit |
40 | * sized IMR register. Provide some size independant methods to access the | 40 | * sized IMR register. Provide some size independent methods to access the |
41 | * IMR register. | 41 | * IMR register. |
42 | */ | 42 | */ |
43 | #ifdef MCFSIM_IMR_IS_16BITS | 43 | #ifdef MCFSIM_IMR_IS_16BITS |
diff --git a/arch/m68k/platform/coldfire/sltimers.c b/arch/m68k/platform/coldfire/sltimers.c index 0a1b937c3e18..6a85daf9a7fd 100644 --- a/arch/m68k/platform/coldfire/sltimers.c +++ b/arch/m68k/platform/coldfire/sltimers.c | |||
@@ -106,7 +106,7 @@ static cycle_t mcfslt_read_clk(struct clocksource *cs) | |||
106 | cycles = mcfslt_cnt; | 106 | cycles = mcfslt_cnt; |
107 | local_irq_restore(flags); | 107 | local_irq_restore(flags); |
108 | 108 | ||
109 | /* substract because slice timers count down */ | 109 | /* subtract because slice timers count down */ |
110 | return cycles - scnt; | 110 | return cycles - scnt; |
111 | } | 111 | } |
112 | 112 | ||