aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/blackfin/kernel/irqchip.c2
-rw-r--r--arch/blackfin/kernel/traps.c2
-rw-r--r--arch/blackfin/mach-bf533/boards/cm_bf533.c2
-rw-r--r--arch/blackfin/mach-bf533/boards/ezkit.c2
-rw-r--r--arch/blackfin/mach-bf533/ints-priority.c2
-rw-r--r--arch/blackfin/mach-bf537/boards/generic_board.c2
-rw-r--r--arch/blackfin/mach-bf537/boards/pnav10.c2
-rw-r--r--arch/blackfin/mach-bf537/boards/stamp.c2
-rw-r--r--arch/blackfin/mach-bf537/ints-priority.c2
-rw-r--r--arch/blackfin/mach-bf561/boards/cm_bf561.c4
-rw-r--r--arch/blackfin/mach-bf561/ints-priority.c2
-rw-r--r--arch/blackfin/mach-common/ints-priority-dc.c2
-rw-r--r--arch/blackfin/mach-common/ints-priority-sc.c2
-rw-r--r--arch/blackfin/mm/blackfin_sram.c6
14 files changed, 17 insertions, 17 deletions
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c
index df5bf022cf79..80996a1a94ca 100644
--- a/arch/blackfin/kernel/irqchip.c
+++ b/arch/blackfin/kernel/irqchip.c
@@ -91,7 +91,7 @@ int show_interrupts(struct seq_file *p, void *v)
91} 91}
92 92
93/* 93/*
94 * do_IRQ handles all hardware IRQ's. Decoded IRQs should not 94 * do_IRQ handles all hardware IRQs. Decoded IRQs should not
95 * come via this function. Instead, they should provide their 95 * come via this function. Instead, they should provide their
96 * own 'handler' 96 * own 'handler'
97 */ 97 */
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index 9932edee8cb4..5ab87b0b92dd 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -557,7 +557,7 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr)
557 break; 557 break;
558#ifndef CONFIG_DEBUG_HWERR 558#ifndef CONFIG_DEBUG_HWERR
559 /* If one of the last few instructions was a STI 559 /* If one of the last few instructions was a STI
560 * it is likily that the error occured awhile ago 560 * it is likely that the error occured awhile ago
561 * and we just noticed 561 * and we just noticed
562 */ 562 */
563 if (x >= 0x0040 && x <= 0x0047 && i <= 0) 563 if (x >= 0x0040 && x <= 0x0047 && i <= 0)
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c
index 23a7f607df3f..edd31ce4f8d2 100644
--- a/arch/blackfin/mach-bf533/boards/cm_bf533.c
+++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * File: arch/blackfin/mach-bf533/boards/cm_bf533.c 2 * File: arch/blackfin/mach-bf533/boards/cm_bf533.c
3 * Based on: arch/blackfin/mach-bf533/boards/ezkit.c 3 * Based on: arch/blackfin/mach-bf533/boards/ezkit.c
4 * Author: Aidan Williams <aidan@nicta.com.au> Copright 2005 4 * Author: Aidan Williams <aidan@nicta.com.au> Copyright 2005
5 * 5 *
6 * Created: 2005 6 * Created: 2005
7 * Description: Board description file 7 * Description: Board description file
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c
index 747298ea907b..0b522d95160d 100644
--- a/arch/blackfin/mach-bf533/boards/ezkit.c
+++ b/arch/blackfin/mach-bf533/boards/ezkit.c
@@ -1,6 +1,6 @@
1/* 1/*
2 * File: arch/blackfin/mach-bf533/ezkit.c 2 * File: arch/blackfin/mach-bf533/ezkit.c
3 * Based on: Orginal Work 3 * Based on: Original Work
4 * Author: Aidan Williams <aidan@nicta.com.au> 4 * Author: Aidan Williams <aidan@nicta.com.au>
5 * 5 *
6 * Created: 2005 6 * Created: 2005
diff --git a/arch/blackfin/mach-bf533/ints-priority.c b/arch/blackfin/mach-bf533/ints-priority.c
index 36a693345204..a3e1789167be 100644
--- a/arch/blackfin/mach-bf533/ints-priority.c
+++ b/arch/blackfin/mach-bf533/ints-priority.c
@@ -4,7 +4,7 @@
4 * Author: Michael Hennerich 4 * Author: Michael Hennerich
5 * 5 *
6 * Created: ? 6 * Created: ?
7 * Description: Set up the interupt priorities 7 * Description: Set up the interrupt priorities
8 * 8 *
9 * Modified: 9 * Modified:
10 * Copyright 2004-2006 Analog Devices Inc. 10 * Copyright 2004-2006 Analog Devices Inc.
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c
index 9019c0edbe7c..fd57e7439e0f 100644
--- a/arch/blackfin/mach-bf537/boards/generic_board.c
+++ b/arch/blackfin/mach-bf537/boards/generic_board.c
@@ -55,7 +55,7 @@ static struct resource bfin_pcmcia_cf_resources[] = {
55 .end = 0x20312000, 55 .end = 0x20312000,
56 .flags = IORESOURCE_MEM, 56 .flags = IORESOURCE_MEM,
57 },{ 57 },{
58 .start = 0x20311000, /* Attribute Memeory */ 58 .start = 0x20311000, /* Attribute Memory */
59 .end = 0x20311FFF, 59 .end = 0x20311FFF,
60 .flags = IORESOURCE_MEM, 60 .flags = IORESOURCE_MEM,
61 },{ 61 },{
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index 40d3a1b70ee7..8aaf76dfce80 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -59,7 +59,7 @@ static struct resource bfin_pcmcia_cf_resources[] = {
59 .end = 0x20312000, 59 .end = 0x20312000,
60 .flags = IORESOURCE_MEM, 60 .flags = IORESOURCE_MEM,
61 },{ 61 },{
62 .start = 0x20311000, /* Attribute Memeory */ 62 .start = 0x20311000, /* Attribute Memory */
63 .end = 0x20311FFF, 63 .end = 0x20311FFF,
64 .flags = IORESOURCE_MEM, 64 .flags = IORESOURCE_MEM,
65 },{ 65 },{
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index ba2f875a7f7d..3a29b4d15f25 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -108,7 +108,7 @@ static struct resource bfin_pcmcia_cf_resources[] = {
108 .end = 0x20312000, 108 .end = 0x20312000,
109 .flags = IORESOURCE_MEM, 109 .flags = IORESOURCE_MEM,
110 },{ 110 },{
111 .start = 0x20311000, /* Attribute Memeory */ 111 .start = 0x20311000, /* Attribute Memory */
112 .end = 0x20311FFF, 112 .end = 0x20311FFF,
113 .flags = IORESOURCE_MEM, 113 .flags = IORESOURCE_MEM,
114 },{ 114 },{
diff --git a/arch/blackfin/mach-bf537/ints-priority.c b/arch/blackfin/mach-bf537/ints-priority.c
index fd6308eccbe6..2dbf3df465d1 100644
--- a/arch/blackfin/mach-bf537/ints-priority.c
+++ b/arch/blackfin/mach-bf537/ints-priority.c
@@ -4,7 +4,7 @@
4 * Author: Michael Hennerich 4 * Author: Michael Hennerich
5 * 5 *
6 * Created: 6 * Created:
7 * Description: Set up the interupt priorities 7 * Description: Set up the interrupt priorities
8 * 8 *
9 * Modified: 9 * Modified:
10 * Copyright 2004-2006 Analog Devices Inc. 10 * Copyright 2004-2006 Analog Devices Inc.
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c
index 6824e956d153..3dc5c042048c 100644
--- a/arch/blackfin/mach-bf561/boards/cm_bf561.c
+++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * File: arch/blackfin/mach-bf533/boards/cm_bf561.c 2 * File: arch/blackfin/mach-bf533/boards/cm_bf561.c
3 * Based on: arch/blackfin/mach-bf533/boards/ezkit.c 3 * Based on: arch/blackfin/mach-bf533/boards/ezkit.c
4 * Author: Aidan Williams <aidan@nicta.com.au> Copright 2005 4 * Author: Aidan Williams <aidan@nicta.com.au> Copyright 2005
5 * 5 *
6 * Created: 2006 6 * Created: 2006
7 * Description: Board description file 7 * Description: Board description file
@@ -43,7 +43,7 @@
43char *bfin_board_name = "Bluetechnix CM BF561"; 43char *bfin_board_name = "Bluetechnix CM BF561";
44 44
45#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) 45#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
46/* all SPI perpherals info goes here */ 46/* all SPI peripherals info goes here */
47 47
48#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) 48#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
49static struct mtd_partition bfin_spi_flash_partitions[] = { 49static struct mtd_partition bfin_spi_flash_partitions[] = {
diff --git a/arch/blackfin/mach-bf561/ints-priority.c b/arch/blackfin/mach-bf561/ints-priority.c
index 89c52ff95b27..86e3b0ee93f4 100644
--- a/arch/blackfin/mach-bf561/ints-priority.c
+++ b/arch/blackfin/mach-bf561/ints-priority.c
@@ -4,7 +4,7 @@
4 * Author: Michael Hennerich 4 * Author: Michael Hennerich
5 * 5 *
6 * Created: 6 * Created:
7 * Description: Set up the interupt priorities 7 * Description: Set up the interrupt priorities
8 * 8 *
9 * Modified: 9 * Modified:
10 * Copyright 2004-2006 Analog Devices Inc. 10 * Copyright 2004-2006 Analog Devices Inc.
diff --git a/arch/blackfin/mach-common/ints-priority-dc.c b/arch/blackfin/mach-common/ints-priority-dc.c
index f3cf07036c2a..80943bbd37c2 100644
--- a/arch/blackfin/mach-common/ints-priority-dc.c
+++ b/arch/blackfin/mach-common/ints-priority-dc.c
@@ -4,7 +4,7 @@
4 * Author: 4 * Author:
5 * 5 *
6 * Created: ? 6 * Created: ?
7 * Description: Set up the interupt priorities 7 * Description: Set up the interrupt priorities
8 * 8 *
9 * Modified: 9 * Modified:
10 * 1996 Roman Zippel 10 * 1996 Roman Zippel
diff --git a/arch/blackfin/mach-common/ints-priority-sc.c b/arch/blackfin/mach-common/ints-priority-sc.c
index 34b62288ec3c..2cfc7d5aec5c 100644
--- a/arch/blackfin/mach-common/ints-priority-sc.c
+++ b/arch/blackfin/mach-common/ints-priority-sc.c
@@ -4,7 +4,7 @@
4 * Author: 4 * Author:
5 * 5 *
6 * Created: ? 6 * Created: ?
7 * Description: Set up the interupt priorities 7 * Description: Set up the interrupt priorities
8 * 8 *
9 * Modified: 9 * Modified:
10 * 1996 Roman Zippel 10 * 1996 Roman Zippel
diff --git a/arch/blackfin/mm/blackfin_sram.c b/arch/blackfin/mm/blackfin_sram.c
index dd0c6501c424..3c9e63503f68 100644
--- a/arch/blackfin/mm/blackfin_sram.c
+++ b/arch/blackfin/mm/blackfin_sram.c
@@ -149,7 +149,7 @@ static void *_l1_sram_alloc(size_t size, struct l1_sram_piece *pfree, int count)
149 size = (size + 3) & ~3; 149 size = (size + 3) & ~3;
150 150
151 /* not use the good method to match the best slot !!! */ 151 /* not use the good method to match the best slot !!! */
152 /* search an available memeory slot */ 152 /* search an available memory slot */
153 for (i = 0; i < count; i++) { 153 for (i = 0; i < count; i++) {
154 if ((pfree[i].flag == SRAM_SLT_FREE) 154 if ((pfree[i].flag == SRAM_SLT_FREE)
155 && (pfree[i].size >= size)) { 155 && (pfree[i].size >= size)) {
@@ -162,7 +162,7 @@ static void *_l1_sram_alloc(size_t size, struct l1_sram_piece *pfree, int count)
162 if (i >= count) 162 if (i >= count)
163 return NULL; 163 return NULL;
164 164
165 /* updated the NULL memeory slot !!! */ 165 /* updated the NULL memory slot !!! */
166 if (pfree[i].size > size) { 166 if (pfree[i].size > size) {
167 for (i = 0; i < count; i++) { 167 for (i = 0; i < count; i++) {
168 if (pfree[i].flag == SRAM_SLT_NULL) { 168 if (pfree[i].flag == SRAM_SLT_NULL) {
@@ -186,7 +186,7 @@ static void *_l1_sram_alloc_max(struct l1_sram_piece *pfree, int count,
186 int i, index = -1; 186 int i, index = -1;
187 void *addr = NULL; 187 void *addr = NULL;
188 188
189 /* search an available memeory slot */ 189 /* search an available memory slot */
190 for (i = 0; i < count; i++) { 190 for (i = 0; i < count; i++) {
191 if (pfree[i].flag == SRAM_SLT_FREE && pfree[i].size > best) { 191 if (pfree[i].flag == SRAM_SLT_FREE && pfree[i].size > best) {
192 addr = pfree[i].paddr; 192 addr = pfree[i].paddr;