diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-09-03 18:56:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:06:07 -0400 |
commit | 42a3b4f25af8f8d77feddf27f839fa0628dbff1a (patch) | |
tree | 332370ff3889fabb66a45fb5dcf605b142de77c8 /arch/mips/mips-boards | |
parent | 875d43e72b5bf22161a81de7554f88eccf8a51ae (diff) |
[PATCH] mips: nuke trailing whitespace
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/mips/mips-boards')
-rw-r--r-- | arch/mips/mips-boards/atlas/atlas_int.c | 2 | ||||
-rw-r--r-- | arch/mips/mips-boards/generic/init.c | 6 | ||||
-rw-r--r-- | arch/mips/mips-boards/generic/time.c | 2 | ||||
-rw-r--r-- | arch/mips/mips-boards/malta/malta_setup.c | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/mips/mips-boards/atlas/atlas_int.c b/arch/mips/mips-boards/atlas/atlas_int.c index 8f1d875217a2..19d4b0792460 100644 --- a/arch/mips/mips-boards/atlas/atlas_int.c +++ b/arch/mips/mips-boards/atlas/atlas_int.c | |||
@@ -122,7 +122,7 @@ void __init arch_init_irq(void) | |||
122 | int i; | 122 | int i; |
123 | 123 | ||
124 | atlas_hw0_icregs = (struct atlas_ictrl_regs *)ioremap (ATLAS_ICTRL_REGS_BASE, sizeof(struct atlas_ictrl_regs *)); | 124 | atlas_hw0_icregs = (struct atlas_ictrl_regs *)ioremap (ATLAS_ICTRL_REGS_BASE, sizeof(struct atlas_ictrl_regs *)); |
125 | 125 | ||
126 | /* | 126 | /* |
127 | * Mask out all interrupt by writing "1" to all bit position in | 127 | * Mask out all interrupt by writing "1" to all bit position in |
128 | * the interrupt reset reg. | 128 | * the interrupt reset reg. |
diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mips-boards/generic/init.c index 31caf0603a3f..311155d1d3ed 100644 --- a/arch/mips/mips-boards/generic/init.c +++ b/arch/mips/mips-boards/generic/init.c | |||
@@ -200,7 +200,7 @@ void __init kgdb_config (void) | |||
200 | generic_putDebugChar = saa9730_putDebugChar; | 200 | generic_putDebugChar = saa9730_putDebugChar; |
201 | generic_getDebugChar = saa9730_getDebugChar; | 201 | generic_getDebugChar = saa9730_getDebugChar; |
202 | } | 202 | } |
203 | else | 203 | else |
204 | #endif | 204 | #endif |
205 | { | 205 | { |
206 | speed = rs_kgdb_hook(line, speed); | 206 | speed = rs_kgdb_hook(line, speed); |
@@ -243,7 +243,7 @@ void __init prom_init(void) | |||
243 | mips_revision_corid = MIPS_REVISION_CORID; | 243 | mips_revision_corid = MIPS_REVISION_CORID; |
244 | 244 | ||
245 | if (mips_revision_corid == MIPS_REVISION_CORID_CORE_EMUL) { | 245 | if (mips_revision_corid == MIPS_REVISION_CORID_CORE_EMUL) { |
246 | if (BONITO_PCIDID == 0x0001df53 || | 246 | if (BONITO_PCIDID == 0x0001df53 || |
247 | BONITO_PCIDID == 0x0003df53) | 247 | BONITO_PCIDID == 0x0003df53) |
248 | mips_revision_corid = MIPS_REVISION_CORID_CORE_EMUL_BON; | 248 | mips_revision_corid = MIPS_REVISION_CORID_CORE_EMUL_BON; |
249 | else | 249 | else |
@@ -310,7 +310,7 @@ void __init prom_init(void) | |||
310 | case MIPS_REVISION_CORID_CORE_MSC: | 310 | case MIPS_REVISION_CORID_CORE_MSC: |
311 | case MIPS_REVISION_CORID_CORE_FPGA2: | 311 | case MIPS_REVISION_CORID_CORE_FPGA2: |
312 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: | 312 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: |
313 | _pcictrl_msc = (unsigned long)ioremap(MIPS_MSC01_PCI_REG_BASE, 0x2000); | 313 | _pcictrl_msc = (unsigned long)ioremap(MIPS_MSC01_PCI_REG_BASE, 0x2000); |
314 | 314 | ||
315 | #ifdef CONFIG_CPU_LITTLE_ENDIAN | 315 | #ifdef CONFIG_CPU_LITTLE_ENDIAN |
316 | MSC_WRITE(MSC01_PCI_SWAP, MSC01_PCI_SWAP_NOSWAP); | 316 | MSC_WRITE(MSC01_PCI_SWAP, MSC01_PCI_SWAP_NOSWAP); |
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c index fe7fc17305a6..16315444dd5a 100644 --- a/arch/mips/mips-boards/generic/time.c +++ b/arch/mips/mips-boards/generic/time.c | |||
@@ -89,7 +89,7 @@ static unsigned int __init estimate_cpu_frequency(void) | |||
89 | * really calculate the timer frequency | 89 | * really calculate the timer frequency |
90 | * For now we hardwire the SEAD board frequency to 12MHz. | 90 | * For now we hardwire the SEAD board frequency to 12MHz. |
91 | */ | 91 | */ |
92 | 92 | ||
93 | if ((prid == (PRID_COMP_MIPS | PRID_IMP_20KC)) || | 93 | if ((prid == (PRID_COMP_MIPS | PRID_IMP_20KC)) || |
94 | (prid == (PRID_COMP_MIPS | PRID_IMP_25KF))) | 94 | (prid == (PRID_COMP_MIPS | PRID_IMP_25KF))) |
95 | count = 12000000; | 95 | count = 12000000; |
diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c index 3377e66de9eb..df6db6419ae9 100644 --- a/arch/mips/mips-boards/malta/malta_setup.c +++ b/arch/mips/mips-boards/malta/malta_setup.c | |||
@@ -149,15 +149,15 @@ static int __init malta_setup(void) | |||
149 | argptr = prom_getcmdline(); | 149 | argptr = prom_getcmdline(); |
150 | if (strstr(argptr, "iobcuncached")) { | 150 | if (strstr(argptr, "iobcuncached")) { |
151 | BONITO_PCICACHECTRL &= ~BONITO_PCICACHECTRL_IOBCCOH_EN; | 151 | BONITO_PCICACHECTRL &= ~BONITO_PCICACHECTRL_IOBCCOH_EN; |
152 | BONITO_PCIMEMBASECFG = BONITO_PCIMEMBASECFG & | 152 | BONITO_PCIMEMBASECFG = BONITO_PCIMEMBASECFG & |
153 | ~(BONITO_PCIMEMBASECFG_MEMBASE0_CACHED | | 153 | ~(BONITO_PCIMEMBASECFG_MEMBASE0_CACHED | |
154 | BONITO_PCIMEMBASECFG_MEMBASE1_CACHED); | 154 | BONITO_PCIMEMBASECFG_MEMBASE1_CACHED); |
155 | printk("Disabled Bonito IOBC coherency\n"); | 155 | printk("Disabled Bonito IOBC coherency\n"); |
156 | } | 156 | } |
157 | else { | 157 | else { |
158 | BONITO_PCICACHECTRL |= BONITO_PCICACHECTRL_IOBCCOH_EN; | 158 | BONITO_PCICACHECTRL |= BONITO_PCICACHECTRL_IOBCCOH_EN; |
159 | BONITO_PCIMEMBASECFG |= | 159 | BONITO_PCIMEMBASECFG |= |
160 | (BONITO_PCIMEMBASECFG_MEMBASE0_CACHED | | 160 | (BONITO_PCIMEMBASECFG_MEMBASE0_CACHED | |
161 | BONITO_PCIMEMBASECFG_MEMBASE1_CACHED); | 161 | BONITO_PCIMEMBASECFG_MEMBASE1_CACHED); |
162 | printk("Disabled Bonito IOBC coherency\n"); | 162 | printk("Disabled Bonito IOBC coherency\n"); |
163 | } | 163 | } |